/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/tests/test_conflicts.py

The ParentLoop.format has been updated, fix fallouts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
794
794
$ bzr commit -m 'Moved dir1 into dir2'
795
795
 
796
796
$ bzr merge ../trunk
797
 
2>Conflict moving dir2/dir1 into dir2.  Cancelled move.
 
797
2>Conflict moving dir2 into dir2/dir1. Cancelled move.
798
798
2>1 conflicts encountered.
799
799
"""
800
800