Subject: Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

From: John Keeping <[email-masked]>
Date: Fri, 25 Jan 2013 22:02:22 +0000

On Fri, Jan 25, 2013 at 01:47:59PM -0800, Junio C Hamano wrote:
> John Keeping <[email-masked]> writes:
> > With the patch above, the block of code at the top becomes:
> >
> >  	test "$tool" = defaults && continue
> >
> >  	setup_tool "$tool" 2>/dev/null || continue
> >  	merge_tool_path=$(translate_merge_tool_path "$tool")
> >
> > which IMHO is pretty readable.
> 
> Of course it is.  The current callers of setup_tool may need some
> adjustments, but that should be fairly trivial, I hope.

There are only two and one of them already seems like it doesn't want
the command to cause the script to exit.

David, can you incorporate the following two patches when you re-roll?
Your original 7/7 with the change above will want to build on 8/7.

John