To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 3144.3.3.
- Committer: Aaron Bentley
- Date: 2007-12-28 21:45:18 UTC
- mto: (3144.5.2 specific-file)
- mto: This revision was merged to the branch mainline in revision 3156.
- Revision ID: abentley@panoramicfeedback.com-20071228214518-kbzpqoco171k1jdu
Update test for new conflicted types
- files modified:
- bzrlib/tests/test_merge.py
expand all
collapse all
added
removed
