From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Wed, 01 Apr 2009 22:39:41 GMT
Subject: Re: [PATCH 03/10] Add a mergetool-lib scriptlet for holding common merge tool functions
Message-ID: <200904020039.41894.markus.heidelberg@web.de>
In-Reply-To: <1238590514-41893-4-git-send-email-davvid@gmail.com>

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
		;;