Viewing all changes in revision 4597.9.9.
- Committer: Vincent Ladeuil
- Date: 2010-04-26 13:25:57 UTC
- mto: (5401.1.1 integration) (4597.14.1 638451-malformed)
- mto: This revision was merged to the branch mainline in revision 5404.
- Revision ID: v.ladeuil+lp@free.fr-20100426132557-9l5xbclp29ugduen
Fix wrong conflict resolution (thanks to test coverage...).
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
