From: Theodore Tso <tytso@mit.edu>
Date: Wed, 06 Jun 2007 02:45:45 GMT
Subject: Re: [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool
Message-ID: <20070606024545.GA32603@thunk.org>
In-Reply-To: <11810938823594-git-send-email-dpmcgee@gmail.com>

Dan, your patch didn't add a gvimdiff check to the code which
determins which merge tool to use if one isn't specified in the config
file:

if test -z "$merge_tool" ; then
    if type kdiff3 >/dev/null 2>&1 && test -n "$DISPLAY"; then
	merge_tool="kdiff3";
    elif type tkdiff >/dev/null 2>&1 && test -n "$DISPLAY"; then
	merge_tool=tkdiff
    elif type xxdiff >/dev/null 2>&1 && test -n "$DISPLAY"; then
	merge_tool=xxdiff
    elif type meld >/dev/null 2>&1 && test -n "$DISPLAY"; then
	merge_tool=meld
    elif type opendiff >/dev/null 2>&1; then
	merge_tool=opendiff
    ...

Was this interntional?

Regards,

						- Ted