Re: [PATCH 03/10] Add a mergetool-lib scriptlet for holding common merge tool functions

From: David Aguilar <davvid@gmail.com>
Date: Apr 2, 2009, 03:58 UTC
Message-ID: <20090402035839.GA43852@gmail.com>
In-Reply-To: <200904020039.41894.markus.heidelberg@web.de>

On  0, Markus Heidelberg <markus.heidelberg@web.de> wrote:

Show 23 quoted lines

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

I'll reroll tonight and include you on the CC when I resent the patches in question.

Thanks Markus.

-- 
		David