All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sylvain Rabot <sylvain@abstraction.fr>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] git-mergetool--lib.sh: fix mergetool.<tool>.* configurations ignored for known tools
Date: Sun, 06 Jun 2010 00:42:29 +0200	[thread overview]
Message-ID: <1275777749.18270.23.camel@kheops> (raw)
In-Reply-To: <m2fx11n8rp.fsf@igel.home>

[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

On Sat, 2010-06-05 at 11:11 +0200, Andreas Schwab wrote:
> Sylvain Rabot <sylvain@abstraction.fr> 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@abstraction.fr>

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

  reply	other threads:[~2010-06-05 22:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-05  2:31 [PATCH] git-mergetool--lib.sh: fix mergetool.<tool>.* configurations ignored for known tools Sylvain Rabot
2010-06-05  2:31 ` Sylvain Rabot
2010-06-05  9:11   ` Andreas Schwab
2010-06-05 22:42     ` Sylvain Rabot [this message]
2010-06-08  8:34   ` David Aguilar
2010-06-08 21:05     ` Junio C Hamano
2010-06-11  9:54     ` Sylvain Rabot
2010-06-09 19:24   ` Charles Bailey
2010-06-11 10:06     ` Sylvain Rabot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1275777749.18270.23.camel@kheops \
    --to=sylvain@abstraction.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=schwab@linux-m68k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.