From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 29 Mar 2007 13:46:31 +0000 (-0400)
Subject: mergetool: Remove spurious error message if merge.tool config option not set
X-Git-Tag: v1.5.1~19^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8;p=git.git

mergetool: Remove spurious error message if merge.tool config option not set

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 1355fcb19..c1fde41a0 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -280,7 +280,7 @@ done
 if test -z "$merge_tool"; then
     merge_tool=`git-config merge.tool`
     case "$merge_tool" in
-	kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff)
+	kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff | "")
 	    ;; # happy
 	*)
 	    echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"