/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Andrew Bennetts
  • Date: 2009-05-01 07:59:02 UTC
  • mfrom: (4319 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4320.
  • Revision ID: andrew.bennetts@canonical.com-20090501075902-evil2r4edle6qx4d
Merge from bzr.dev, resolving a conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
28
28
    trace,
29
29
    ui,
30
30
    )
31
 
from bzrlib import bencode
 
31
from bzrlib.util import bencode
32
32
""")
33
33
from bzrlib.tuned_gzip import GzipFile
34
34