mergetool: Remove spurious error message if merge.tool config option not set
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o committed
Mar 29, 2007 at 09:46 UTC
b7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8
1 file changed
+1
-1
git-mergetool.sh
+1
-1
@@ -280,7 +280,7 @@ done
280
if test -z "$merge_tool"; then
281
merge_tool=`git-config merge.tool`
282
case "$merge_tool" in
283
- kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff)
283
+ kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff | "")
284
;; # happy
285
*)
286
echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"