Viewing all changes in revision 4597.10.2.
- Committer: Vincent Ladeuil
- Date: 2010-03-12 10:53:16 UTC
- mfrom: (4597.11.1 537956-parent-loop-incomplete)
- mto: This revision was merged to the branch mainline in revision 5135.
- Revision ID: v.ladeuil+lp@free.fr-20100312105316-20k7j0qgsvy1y5j3
Merge 537956-parent-loop-incomplete into more-tests
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
