[MERGE] Fix #306879 by mentioning the base revision id in the 'BASE' conflict marker lines

Vincent Ladeuil v.ladeuil+lp at free.fr
Tue Dec 16 17:55:48 GMT 2008


A non-text attachment was scrubbed...
Name: 306879-show-base-revid-3910.patch
Type: text/x-patch
Size: 5100 bytes
Desc: BZR merge
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081216/488b3ff0/attachment.bin 


More information about the bazaar mailing list