|
From: | Richard Copley |
Subject: | Re: Regarding smerge upper/lower; needs NEWS |
Date: | Thu, 15 Mar 2018 16:09:03 +0000 |
> 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
[Prev in Thread] | Current Thread | [Next in Thread] |