Re: Regarding smerge upper/lower; needs NEWS

[Richard Copley <rcopley@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]

On 15 March 2018 at 15:43, Stefan Monnier <monnier@iro.umontreal.ca> wrote:

> > In "smerge-ediff", I think.
>
> smerge-ediff is a command which basically *leaves* SMerge (the whole
> purpose of SMerge is to do the conflict resolution directly in the one
> buffer rather than going through Ediff, which is a fine tool but too
> heavyweight for my taste in 99% of the cases (tho I really appreciate it
> for that remaining 1%)).
>
> Also the upper/lower (or any other nomenclature SMerge uses) only
> affects the name of the generated buffers: Ediff labels will simply
> always be A/B with corresponding key-bindings and the upper/lower
> terminology of SMerge just disappears.
>
> So I guess what you're saying is that we should improve the consistency
> in the naming used by SMerge and Ediff.  That's a good point.
> And indeed upper/lower doesn't work for Ediff.
>
>
>         Stefan
>

Thanks Stefan and Kaushal.
I'll revert the change locally for now.
I don't use Smerge itself (perhaps I should learn), so I suppose it's
natural that I don't understand why UPPER and LOWER are such good labels
that it's important to keep them.

[-- Attachment #2: Type: text/html, Size: 1725 bytes --]