It seemed to me that Junio's suggestion made the most amount of sense, but I tinkered with the with the warning message to make it clear that the cause of the warning was a bugus tool in the merge.tool configuration parameter. This has also been pushed out to git://repo.or.cz/git/mergetool.git Junio, please pull if you approve... - Ted commit d6678c28e30e836449092a2917d4b0bd6254b06c Author: Theodore Ts'o <tytso@xxxxxxx> Date: Sun Mar 18 22:30:10 2007 -0400 mergetool: print an appropriate warning if merge.tool is unknown Also add support for vimdiff Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx> diff --git a/git-mergetool.sh b/git-mergetool.sh index 563c5c0..7942fd0 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -288,10 +288,15 @@ done if test -z "$merge_tool"; then merge_tool=`git-config merge.tool` - if test $merge_tool = kdiff3 -o $merge_tool = tkdiff -o \ - $merge_tool = xxdiff -o $merge_tool = meld ; then - unset merge_tool - fi + case "$merge_tool" in + kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff) + ;; # happy + *) + echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" + echo >&2 "Resetting to default..." + unset merge_tool + ;; + esac fi if test -z "$merge_tool" ; then - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html