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

…not set Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mirror · Mar 29, 2007 · b7b36f9 · b7b36f9
1 parent ddc0c49
commit b7b36f9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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"