[PATCH 2 of 2] filemerge: add non-interactive internal:merge-local and internal:merge-other

[Jordi Gutiérrez Hermoso]

On Tue, 2014-08-26 at 22:57 +0200, Pierre-Yves David wrote:
> 
> On 08/25/2014 01:06 AM, Jordi Gutiérrez Hermoso wrote:
> > # HG changeset patch
> > # User Jordi Gutiérrez Hermoso <jordigh at octave.org>
> > # Date 1407783206 14400
> > #      Mon Aug 11 14:53:26 2014 -0400
> > # Node ID 87bc71fdf83ba5ba2d85f8cf082819d30b93e31f
> > # Parent  44ecb51c857da4cbfddcc8c1220747a477a96ac2
> > filemerge: add non-interactive internal:merge-local and internal:merge-other
> 
> I was expecting some trace of reflexion about the naming scheme of this 
> familly of tool. any advance on that?

Yeah, I tried to think of something else, and I couldn't think of a
better name for it. I asked around, nobody answered. I don't think the
name is that bad. It's about as short as it can be while remaining
descriptive. I honestly don't understand why you dislike the name, or
what you have in mind instead.

- Jordi G. H.