Viewing all changes in revision 4597.3.28.
- Committer: Vincent Ladeuil
- Date: 2009-10-19 08:51:56 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20091019085156-3pq8i5e51y6c7uui
Implement --interactive for ContentsConflict.
* bzrlib/tests/test_conflicts.py:
(TestResolveContentConflicts): Tests for --interactive.
* bzrlib/conflicts.py:
(_resolve_interactive): Clean up the files creted to help
resolving the conflict if any.
(ContentsConflict): Add actions for --interactive.
* bzrlib/tests/test_conflicts.py:
(TestResolveContentConflicts): Tests for --interactive.
* bzrlib/conflicts.py:
(_resolve_interactive): Clean up the files creted to help
resolving the conflict if any.
(ContentsConflict): Add actions for --interactive.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
