/brz/remove-bazaar

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

Viewing all changes in revision 4597.7.18.

Start addressing Andrew's concerns.

* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts): Add a docstring.
(TestResolvePathConflictBefore531967.assertPathConflict): Really
inject the old fashioned conflict object.

* bzrlib/merge.py:
(Merge3Merger._merge_names): Better explain why we shouldn't
generate helpers at this point.
(Merge3Merger.cook_conflicts): Be more verbose when failing.

* bzrlib/conflicts.py:
(PathConflict._resolve): Be more verbose when failing.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: