emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful


From: Stefan Monnier
Subject: Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful
Date: Fri, 22 Nov 2013 20:42:41 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux)

Sounds OK (i.e. patch welcome).  Just be careful that diff3 markers
don't always come with useful "names".  Also mine/other is used as
mnemonic for key-bindings, so the terminology is "deeply" embedded in
smerge-mode, so maybe we should use "MINE - HEAD" and "OTHER -
2c633c8... Issue 3656/2: disambiguate our own ::to_string from
std::to_string" for the names.

In any case, please make it a bug-report, so we have a number to
track it.


        Stefan



reply via email to

[Prev in Thread] Current Thread [Next in Thread]