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

[Vincent Ladeuil]

A non-text attachment was scrubbed...
Name: 306879-show-base-revid-3911.patch
Type: text/x-patch
Size: 14576 bytes
Desc: BZR merge
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081219/e45d3446/attachment.bin