[PATCH] mergetool: Use merge.tool config option.

From: James Bowes <jbowes@dangerouslyinc.com>
Date: Mar 18, 2007, 16:13 UTC
Message-ID: <11742343911678-git-send-email-jbowes@dangerouslyinc.com>

If no merge program was supplied on the commandline, and the config option merge.tool was set to a valid value, then mergetool would unset $merge_tool and instead try to find an installed merge program. This patch removes the code that unset $merge_tool, so the merge.tool config option will always be used, if set.

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
---
 git-mergetool.sh |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 52386a5..19788a1 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -288,10 +288,6 @@ done
 
 if test -z "$merge_tool"; then
     merge_tool=`git-config merge.tool`
-    if test $merge_tool = kdiff3 -o $merge_tool = tkdiff -o \
-	$merge_tool = xxdiff -o $merge_tool = meld ; then
-	unset merge_tool
-    fi
 fi
 
 if test -z "$merge_tool" ; then

-- 
1.5.0.3