Viewing all changes in revision 4597.10.7.
- Committer: Vincent Ladeuil
- Date: 2010-03-25 14:17:21 UTC
- mto: This revision was merged to the branch mainline in revision 5135.
- Revision ID: v.ladeuil+lp@free.fr-20100325141721-bqrj4rh77ywl0g4p
Simplify scenarios mirroring and give a better docstring for TestParametrizedResolveConflicts.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts.mirror_scenarios): Better doc
string. Stop flattening the dicts, embed them in the scenario
instead.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts.mirror_scenarios): Better doc
string. Stop flattening the dicts, embed them in the scenario
instead.
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
