Viewing all changes in revision 5609.6.1.
- Committer: Vincent Ladeuil
- Date: 2011-01-15 17:29:41 UTC
- mfrom: (5050.62.2 2.2)
- mto: (5609.2.3 2.3)
- mto: This revision was merged to the branch mainline in revision 5615.
- Revision ID: v.ladeuil+lp@free.fr-20110115172941-ukpq0aseczd5g0o7
Merge 2.2 into 2.3 including fix for bug #660935
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
