David Aguilar, 01.04.2009: > > diff --git a/git-mergetool-lib.sh b/git-mergetool-lib.sh > +valid_tool () { > + case "$1" in > + kdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge) > + if test "$1" = "kompare" && ! diff_mode; then > + return 1 > + fi > + ;; # happy > + *) > + if ! test -n "$(get_custom_cmd "$1")"; then Better this? if test -z "$(get_custom_cmd "$1")"; then > + return 1 > + fi ;; For consistency: fi ;; -- 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