Viewing all changes in revision 4597.3.35.
- Committer: Vincent Ladeuil
- Date: 2009-10-20 14:47:12 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-20091020144712-8kdhonvi42q7aoos
Implement --interactive for NonDirectoryParent, sort of.
* bzrlib/tests/test_conflicts.py:
(TestResolveNonDirectoryParent): Tests for --interactive.
* bzrlib/conflicts.py:
(NonDirectoryParent): Add actions for --interactive, noting that
we lack the relevant information :-/
* bzrlib/tests/test_conflicts.py:
(TestResolveNonDirectoryParent): Tests for --interactive.
* bzrlib/conflicts.py:
(NonDirectoryParent): Add actions for --interactive, noting that
we lack the relevant information :-/
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
