Re: Regarding smerge upper/lower; needs NEWS

[Richard Copley]

On 7 April 2017 at 20:09, Noam Postavsky <address@hidden> wrote:
> On Fri, Apr 7, 2017 at 2:06 PM, Richard Copley <address@hidden> wrote:
>
>>>> http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=bdfee01a6567b9f08f82bc84d1196e6cb62587ca
>>
>> I've had plenty of time to think about this and I still don't get
>> it. Why are we calling the left window UPPER and the right window
>> LOWER? In the lower pane (the conflicted file for resolution)
>> they are called "variant A" and "variant B". Shouldn't we call
>> them that too, so that we know which one is which?
>>
>
> You seem to be talking about ediff or emerge, but this thread is about
> smerge which operates in a single buffer, no windows involved.

Thanks, I knew I must have been missing something. IMO making
smerge weird is a disadvantage of this change.