Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful

[David Kastrup]

Stefan Monnier <address@hidden> writes:

>> Whenever you use _meaning_-carrying names, they'll be wrong half of the
>> time.  Ediff got that right with A, B, and, uh, C?  No idea (rarely use
>> three-way conflicts).  It's arbitrary what the first and the second
>> _mean_, so you just put them first and second on screen and give them A
>> and B as monikers.
>
> For three-way merges, the 3rd is called "BASE" in smerge, which makes
> sense, no matter how you get that result.  Using A/B/Base is not great
> because of the conflicting first letter of B and Base.
> Maybe we could go with X/Y/Base?

Well, I don't see why "BASE" needs to have a meaning-carrying name while
the others don't, but it could be "C" for "Common ancestor".  Or "R" for
"Root".  But the latter is probably a really bad idea in connection with
ediff bindings.

-- 
David Kastrup