Viewing all changes in revision 6015.47.5.
- Committer: Vincent Ladeuil
- Date: 2011-10-26 16:58:18 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-20111026165818-1nc3t9spcxogzb7c
Fix the other half by also producing a conflict but rely on merge to create the appropriate content. This covers the case where a file is modified in THIS but replaced in OTHER
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
