From: Andy Parkins <andyparkins@gmail.com>
Date: Thu, 01 Mar 2007 11:40:10 GMT
Subject: Re: [PATCH] cvsserver: Make always-binary mode a config file option
Message-ID: <200703011140.11108.andyparkins@gmail.com>
In-Reply-To: <7vhct5rztc.fsf@assigned-by-dhcp.cox.net>

On Thursday 2007 March 01 11:03, Junio C Hamano wrote:

> Once we separate out the handler section, we can introduce more
> useful variables in it (not the "pretty", whose sole purpose was
> to have fun and serve as a demonstration).  Obvious ones are:
>
> 	; takes temporary files old, mine, his and writes the
>         ; result in another
> 	merge = "cmd external-merge-command %s %s %s %s"
>
> 	; takes two temporary files
>         diff = "cmd external-diff-command %s %s"

I was part way through assembling a document when I read this; I hadn't 
thought of the external merge option.  I'll add that and send the document 
soon.


Andy
-- 
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com