|
| From: | Stefan Monnier |
| Subject: | Re: Regarding smerge upper/lower; needs NEWS |
| Date: | Thu, 15 Mar 2018 11:04:51 -0400 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
> "A" and "B" are the names diff3 uses for the conflict markers.
> "A" and "B" are the names used in the documentation.
> "UPPER" and "LOWER" are useless since they don't match up with anything
> else (the conflict markers and the documentation).
They match up with the location of the corresponding chunk of text, tho.
> "UPPER" and "LOWER" are confusing since they are often shown on the left
> and right respectively.
In SMerge? In which circumstance would it be the case?
Stefan
| [Prev in Thread] | Current Thread | [Next in Thread] |