Viewing all changes in revision 4312.1.3.
- Committer: John Arbash Meinel
- Date: 2009-05-01 18:09:24 UTC
- mto: This revision was merged to the branch mainline in revision 4322.
- Revision ID: john@arbash-meinel.com-20090501180924-bco4vmhymopg5lls
Different sides deleting different amounts is now a conflict.
This is because the final 'lines' are different, but something occurred
on each side.
This is because the final 'lines' are different, but something occurred
on each side.
- files modified:
- bzrlib/tests/test_versionedfile.py
expand all
collapse all
added
removed
