Viewing all changes in revision 3008.2.1.
- Committer: Aaron Bentley
- Date: 2007-11-28 16:11:42 UTC
- mto: (3008.1.10 tree-less-merge-diffs)
- mto: This revision was merged to the branch mainline in revision 3189.
- Revision ID: abentley@panoramicfeedback.com-20071128161142-0p2pt3tyv88nlrvt
Ensure conflict resolution works
- files modified:
- bzrlib/tests/test_transform.py
expand all
collapse all
added
removed
