mergetool: print an appropriate warning if merge.tool is unknown
Also add support for vimdiff Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o committed
Mar 18, 2007 at 22:30 UTC
d6678c28e30e836449092a2917d4b0bd6254b06c
1 file changed
+9
-4
git-mergetool.sh
+9
-4
@@ -288,10 +288,15 @@ done
288
289
if test -z "$merge_tool"; then
290
merge_tool=`git-config merge.tool`
291
- if test $merge_tool = kdiff3 -o $merge_tool = tkdiff -o \
292
- $merge_tool = xxdiff -o $merge_tool = meld ; then
293
- unset merge_tool
294
- fi
291
+ case "$merge_tool" in
292
+ kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff)
293
+ ;; # happy
294
+ *)
295
+ echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"
296
+ echo >&2 "Resetting to default..."
297
+ unset merge_tool
298
+ ;;
299
+ esac
300
fi
301
302
if test -z "$merge_tool" ; then