From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Mon, 23 Jul 2012 18:56:26 GMT
Subject: Re: mergetool: support --tool-help option like difftool does
Message-ID: <500D9E5A.2000204@gmail.com>
In-Reply-To: <7vipdemm0a.fsf_-_@alter.siamese.dyndns.org>

On 23.07.2012 19:21, Junio C Hamano wrote:

> This way we do not have to risk the list of tools go out of sync
> between the implementation and the documentation.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Thanks! I've squashed this with

[PATCH v2 5/5] Add a few more code comments and blank lines in guess_merge_tool

and parts of

[PATCH 3/5] Explicitly list all valid diff tools and document --tool-help as an option

and adjusted the docs for git-mergetool accordingly.

-- 
Sebastian Schuberth