From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Apr 2007 16:16:31 GMT
Subject: Re: [PATCH 0/2] Custom low-level merge driver support.
Message-ID: <alpine.LFD.0.98.0704180910120.2828@woody.linux-foundation.org>
In-Reply-To: <20070418153445.GC12888@admingilde.org>



On Wed, 18 Apr 2007, Martin Waitz wrote:
>
> > 	[merge.driver]
> > 		ancient = merge %A %O %B
> 
> or
> 
> [merge "ancient"]
> 	driver = merge %A %O %B

Much better. That format also allows you to add extra flags if you want. 

For example, it might be useful to add something like

	[merge "ancient"]
		name = external three-way merge
		driver = merge %A %O %B

so that you could make the merge process actually say what it is doing 
when it's merging things. Wouldn't it be nice to see

	merging file xyzzy using external three-way merge
	merging file fax.doc using word file merge
	..

when these things trigger?

So even if we do *not* care about the name, this kind of config structure 
is just more flexible. 

		Linus