~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4597.3.33.

Implement --interactive for PathConflict.

* bzrlib/tests/test_conflicts.py:
(TestResolvePathConflict): Tests for --interactive.

* bzrlib/conflicts.py:
(PathConflict): Add actions for --interactive.
(TextConflict): Ensure TextConflict is not solved like a
PathConflict (this double the FIXME about inheritance or put
weight behind the idea that we should define a ConflictSolver
hierarchy independent from the Conflict hierarchy...).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: