Viewing all changes in revision 1616.1.18.
- Committer: Martin Pool
- Date: 2006-03-24 19:11:33 UTC
- mto: This revision was merged to the branch mainline in revision 1626.
- Revision ID: mbp@sourcefrog.net-20060324191133-4f45292db5c5d487
(weave-merge) don't treat killed-both lines as points of agreement;
makes sure that killed-[ab] lines next to change reasons aren't
omitted from conflict descriptions.
Add more weave merge tests about line deletion.
makes sure that killed-[ab] lines next to change reasons aren't
omitted from conflict descriptions.
Add more weave merge tests about line deletion.
- files modified:
- bzrlib/tests/test_weave.py
expand all
collapse all
added
removed
