From b7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 09:46:31 -0400 Subject: [PATCH] mergetool: Remove spurious error message if merge.tool config option not set Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- 2.26.2