Viewing all changes in revision 4597.7.12.
- Committer: Vincent Ladeuil
- Date: 2010-03-09 16:24:31 UTC
- mto: (4597.8.2 531967-unify-name-conflicts) (5112.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5113.
- Revision ID: v.ladeuil+lp@free.fr-20100309162431-hkp98mkfmprus54s
Creating helpers for 'name conflicts' may conflict with the helpers created bfor ContentConflicts, bzrlib.tests.test_transform.TestTransformMerge.test_filename_merge_conflicts fails with this fix.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
