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

[Stefan Monnier <monnier@IRO.UMontreal.CA>]

> For one thing, smerge-ediff (purportedly as opposed to the smerge-mode
> not visibly involved in the user interaction) does not expose _any_ of

We can't assume that the user of smerge-ediff does not also use smerge.
So it's important to keep a connection between the names used in smerge
and the names used in ediff.  Maybe in your case it's not helpful, but
I think the added text should clarify the problem (and the 5/6 extra
chars may occasionally push the extra info past the truncation, but
this truncation problem exists even without those extra 5/6 chars).

> git pull -r
> it labels the upstream changes as "MINE" and my own changes as "OTHER".

Of course, any tool is free top put the 2 in whichever order they
prefer.  Maybe we should revisit the MINE/OTHER names used so far.
But whichever name we use there will need to also be present in
smerge-ediff.


        Stefan