To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 3514.4.14.
- Committer: John Arbash Meinel
- Date: 2008-07-22 23:04:49 UTC
- mto: (3697.7.4 1.7)
- mto: This revision was merged to the branch mainline in revision 3748.
- Revision ID: john@arbash-meinel.com-20080722230449-4mn4a3q2pr5b1zyq
Add a test which shows that the ordering switches when you pick the other parent.
- files modified:
- bzrlib/tests/test_merge.py
expand all
collapse all
added
removed
