On Sat, 2010-06-05 at 11:11 +0200, Andreas Schwab wrote: > Sylvain Rabot <sylvain@xxxxxxxxxxxxxx> 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. > 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 <sylvain@xxxxxxxxxxxxxx>
Attachment:
signature.asc
Description: This is a digitally signed message part