Viewing all changes in revision 4634.101.12.
- Committer: John Arbash Meinel
- Date: 2009-12-08 20:30:25 UTC
- mto: This revision was merged to the branch mainline in revision 4889.
- Revision ID: john@arbash-meinel.com-20091208203025-0jdq8i2n7a1x2siq
Clean up the test_conflicts file for newer apis.
- files modified:
- bzrlib/tests/test_merge_core.py
expand all
collapse all
added
removed
