Viewing all changes in revision 4597.7.2.
- Committer: Vincent Ladeuil
- Date: 2010-03-03 13:13:55 UTC
- mto: (4597.11.1 537956-parent-loop-incomplete) (5112.1.1 integration) (5113.1.1 integration) (5114.1.1 various) (5401.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5113.
- Revision ID: v.ladeuil+lp@free.fr-20100303131355-lkivtt0s1q1ljy5t
Each base scenario should be mirrored.
* bzrlib/tests/test_conflicts.py:
(content_conflict_scenarios): Generate derived scenarios from base.
* bzrlib/tests/test_conflicts.py:
(content_conflict_scenarios): Generate derived scenarios from base.
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
