/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: John Arbash Meinel
  • Date: 2009-05-01 18:09:24 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090501180924-bco4vmhymopg5lls
Different sides deleting different amounts is now a conflict.

This is because the final 'lines' are different, but something occurred
on each side.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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