From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Jan 2013 20:13:33 GMT
Subject: Re: mergetool: include custom tools in '--tool-help'
Message-ID: <7vmwvuv0ya.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130127195618.GS7498@serenity.lan>

John Keeping <john@keeping.me.uk> writes:

> I think I'd want to do this with a suffix if at all, so the output would
> be like this:
>
>     'git mergetool --tool=<tool>' may be set to one of the following:
>
>             araxis
>             gvimdiff
>             gvimdiff2
>             mytool	(user-defined)
>             vimdiff
>             vimdiff2

That is fine by me, but the real users of mergetool please feel free
to raise objections.