Viewing all changes in revision 4312.1.1.
- Committer: John Arbash Meinel
- Date: 2009-04-29 17:02:36 UTC
- mto: This revision was merged to the branch mainline in revision 4322.
- Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
Add a per-implementation test that deleting lines conflicts with modifying lines.
At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171
At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171
- files modified:
- bzrlib/tests/test_merge.py
expand all
collapse all
added
removed
