From: Theodore Ts'o Date: Thu, 29 Mar 2007 15:44:21 GMT Subject: [PATCH] mergetool: Remove spurious error message if merge.tool config option not set Message-ID: <11751830652803-git-send-email-tytso@mit.edu> In-Reply-To: <11751830654112-git-send-email-tytso@mit.edu> Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index aeb32ef..5de2433 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -282,7 +282,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" -- 1.5.1.rc2.1.g8afe-dirty