Viewing all changes in revision 4597.7.5.
- Committer: Vincent Ladeuil
- Date: 2010-03-04 09:37:23 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-20100304093723-k62ul8gr0xn953p2
Simplify resolve_conflict_scenarios.
* bzrlib/tests/test_conflicts.py:
(resolve_conflict_scenarios): Enhance readability.
* bzrlib/tests/test_conflicts.py:
(resolve_conflict_scenarios): Enhance readability.
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
