Viewing all changes in revision 4597.2.24.
- Committer: Vincent Ladeuil
- Date: 2010-02-28 13:58:03 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) (5067.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5068.
- Revision ID: v.ladeuil+lp@free.fr-20100228135803-yrsc4pu9e4bvbf1h
Translate one more test.
* bzrlib/tests/test_conflicts.py:
(TestResolveContentConflicts): Rewrite test_resolve_taking_other as
a whitebox test, refactoring common code.
* bzrlib/tests/test_conflicts.py:
(TestResolveContentConflicts): Rewrite test_resolve_taking_other as
a whitebox test, refactoring common code.
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
