RE: Regarding smerge upper/lower; needs NEWS

[Stephan Mueller]

Ack, I write gibberish for no good reason.  Please ignore me.  Sorry for the 
noise.

stephan();

-----Original Message-----
From: Stephan Mueller 
Sent: Thursday, April 13, 2017 11:56 AM
To: address@hidden
Subject: RE: Regarding smerge upper/lower; needs NEWS

Stefan wrote:

" Let's not forget that smerge works not only for 2-part conflicts but
" also for 3-part conflicts (which I think are immensely more valuable),

Agreed on the higher value of handling 3-part conflicts.

" Currently, the names are
" "upper/base/lower", which I find tolerable, but I'm not sure "a/base/b"
" is good enough.

I'm not sure the name 'upper' adds anything if it's displayed in the upper
pane, which suggests to me that 'a' is no worse.   (And if 'upper' is displayed
anywhere else, it's causing confusion.

stephan();