Viewing all changes in revision 1551.15.59.
- Committer: Aaron Bentley
- Date: 2007-07-23 14:51:48 UTC
- mto: (1551.19.24 Aaron's mergeable stuff)
- mto: This revision was merged to the branch mainline in revision 2649.
- Revision ID: abentley@panoramicfeedback.com-20070723145148-5e1357oxg0ndevw4
Test that default behavior is as before
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
