~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4597.3.19.

Some failing tests.

* bzrlib/tests/test_conflicts.py:
(TestResolveDuplicatePaths.test_resolve_keeping_this): Add
explicit failing tests for resolve --interactive.

* Outline.txt:
Link more bugs.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: