Viewing all changes in revision 6015.47.4.
- Committer: Vincent Ladeuil
- Date: 2011-10-26 15:23:49 UTC
- mto: (6015.44.4 2.4)
- mto: This revision was merged to the branch mainline in revision 6236.
- Revision ID: v.ladeuil+lp@free.fr-20111026152349-kgcy2ja8gjti5o1b
Fix first half of the bug by producing a 'duplicate' conflict instead of a 'content' one when the file has been replaced in THIS and modified in OTHER.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
