To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
-
Committer:
Aaron Bentley
-
Date:
2007-07-06 17:21:34 UTC
-
mto:
(2590.2.12 changes-merge)
-
Revision ID:
abentley@panoramicfeedback.com-20070706172134-kz3k30d2pu61qngi
Restore conflict handling changes