Viewing all changes in revision 1711.2.25.
- Committer: John Arbash Meinel
- Date: 2006-05-29 01:17:43 UTC
- mto: (1753.1.3 add) (1711.7.2 win32) (1946.2.6 reduce-knit-churn)
- mto: This revision was merged to the branch mainline in revision 1733.
- Revision ID: john@arbash-meinel.com-20060529011743-03c33eb3373932b6
Update the merge3 tests, so that they test more realistic data on 'minimal_conflicts'
- files modified:
- bzrlib/tests/test_merge3.py
expand all
collapse all
added
removed
