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

[Vincent Ladeuil]

>>>>> "aaron" == Aaron Bentley <aaron at aaronbentley.com> writes:

    aaron> Vincent Ladeuil wrote:
    >>>>>>> "aaron" == Aaron Bentley <aaron at aaronbentley.com> writes:
    >> 
    aaron> Vincent Ladeuil wrote:
    >> >> Simple fix which add the revid of the base revision after the
    >> >> 'BASE-REVISION' marker.
    >> 
    aaron> I'd rather not use revision-ids where we can avoid it.
    >> 
    >> I rather not use dotted revnos where I can avoid it until we know
    >> how to calculate them without being O(history).

    aaron> As a project, it's been our consistent UI policy not
    aaron> to expose file-ids or revision ids unless the user
    aaron> specifically asked for them.

Right, so we should add a --show-ids option ?

Is there other places where merge can use --show-ids ?

       Vincent