On Thu, Mar 15, 2018 at 10:38 AM Richard Copley <address@hidden
I would find that very confusing in Smerge.
Which documentation? If Smerge documentation, then it should be fixed to update to the convention of upper/lower?
I have never found that convention confusing.. We are strictly speaking of the use of upper/lower in Smerge.
Hmm, the conflicts don't show up left/right for me.. How are you using Smerge?
Why is this change good? What am I missing?
Well, it worked great for me. FYI, I am just an Smerge user (not contributor), and this was a welcome change for my use case.. never done conflict merging using Smerge using left/right orientation as you suggest.