Viewing all changes in revision 4597.3.51.
- Committer: Vincent Ladeuil
- Date: 2009-12-24 14:46:53 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-20091224144653-b8pkfsvnz6qpirqt
Implement conflicts.ResolveActionOption.
* bzrlib/tests/test_conflicts.py:
(TestResolveActionOption): Test the values for action option.
* bzrlib/conflicts.py:
(resolve_action_registry, ResolveActionOption): Define all
conflict resolution actions.
* bzrlib/tests/test_conflicts.py:
(TestResolveActionOption): Test the values for action option.
* bzrlib/conflicts.py:
(resolve_action_registry, ResolveActionOption): Define all
conflict resolution actions.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
