From: Karl Hasselström <kha@treskal.com>
Date: Thu, 01 Mar 2007 11:44:12 GMT
Subject: Re: [PATCH] cvsserver: Make always-binary mode a config file option
Message-ID: <20070301114412.GA13535@diana.vm.bytemark.co.uk>
In-Reply-To: <7vhct5rztc.fsf@assigned-by-dhcp.cox.net>

On 2007-03-01 03:03:11 -0800, Junio C Hamano wrote:

>       ; takes temporary files old, mine, his and writes the
>         ; result in another
>       merge = "cmd external-merge-command %s %s %s %s"

Better make this "%1 %2 %3 %4", "%old %mine %his %result", or
something along those lines, so as to not force a particular argument
order on the external script.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle