From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Mon, 06 Apr 2009 23:42:38 GMT
Subject: Re: [PATCH 09/14] difftool: move 'git-difftool' out of contrib
Message-ID: <200904070142.39026.markus.heidelberg@web.de>
In-Reply-To: <1239006689-14695-10-git-send-email-davvid@gmail.com>

David Aguilar, 06.04.2009:
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> +diff.tool::
> +	Controls which diff tool is used.  `diff.tool` overrides
> +	`merge.tool` when used by linkgit:git-difftool[1] and has
> +	the same valid values as `merge.tool`.

+kompare
-tortoisemerge