To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 5050.73.7.
- Committer: Vincent Ladeuil
- Date: 2011-07-05 09:02:05 UTC
- mto: (5050.77.1 2.2) (6012.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6013.
- Revision ID: v.ladeuil+lp@free.fr-20110705090205-vduyrqt0llpaks8w
Slightly simpler test.
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
