Viewing all changes in revision 3514.2.1.
- Committer: Aaron Bentley
- Date: 2008-06-30 19:23:37 UTC
- mto: This revision was merged to the branch mainline in revision 3543.
- Revision ID: aaron@aaronbentley.com-20080630192337-3btwipid5vm0mty9
Test for correct conflicts on delete + change
- files modified:
- bzrlib/tests/test_merge.py
expand all
collapse all
added
removed
