Viewing all changes in revision 4597.8.12.
- Committer: Vincent Ladeuil
- Date: 2010-03-25 09:09:31 UTC
- mfrom: (4597.7.18 531967-unify-name-conflicts)
- mto: (5113.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5114.
- Revision ID: v.ladeuil+lp@free.fr-20100325090931-db0vev6g6jvkdnqa
Merge fixes from review from the pre-requisite branch
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
