Re: [PATCH] git-mergetool--lib.sh: fix mergetool.<tool>.* configurations ignored for known tools

Sylvain Rabot [off-list ref] writes:

+			if !test -f "$merge_tool_path/$merge_tool_cmd_base"; then

Missing space after '!'.

+			elif !test -x "$merge_tool_path/$merge_tool_cmd_base"; then

Likewise.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

On Sat, 2010-06-05 at 11:11 +0200, Andreas Schwab wrote:

Sylvain Rabot [off-list ref] writes:

quoted

+			if !test -f "$merge_tool_path/$merge_tool_cmd_base"; then

Missing space after '!'.

quoted

+			elif !test -x "$merge_tool_path/$merge_tool_cmd_base"; then

Likewise.

Andreas.

Thanks, 

I have updated the patch, you can find it here
git://git.abstraction.fr/~sylvain/git.git in the mergetool-lib branch.

http://git.abstraction.fr/~sylvain/?p=git.git;a=commitdiff;h=905bfb5cea0750a67bf9bcc2baf22079054742fa

-- 
Sylvain Rabot [off-list ref]