[MERGE] Fix #306879 by mentioning the base revision id in the 'BASE' conflict marker lines
Bundle Buggy
bundlebuggy at aaronbentley.com
Fri Dec 19 13:18:22 GMT 2008
Bundle Buggy has detected this merge request.
For details, see:
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Cm2ocz8b8xc.fsf_-_%40free.fr%3E
Project: Bazaar
More information about the bazaar
mailing list