From: Martin Waitz <tali@admingilde.org>
Date: Thu, 19 Apr 2007 07:52:30 GMT
Subject: Re: [PATCH 0/2] Custom low-level merge driver support.
Message-ID: <20070419075229.GA27208@admingilde.org>
In-Reply-To: <alpine.LFD.0.98.0704181330050.2828@woody.linux-foundation.org>

On Wed, Apr 18, 2007 at 01:35:05PM -0700, Linus Torvalds wrote:
> So maybe each strategy could have "sub-strategies" for other file types.
> 
> Ie something like
> 
> 	[merge "ours"]
> 		name = pick our own version
> 		driver = /bin/true
> 		symlinks = /bin/true

or different attributes for other file types:

[attr] *@ merge=ours		# for symlinks
[attr] */ merge=submodule	# for dirlinks

-- 
Martin Waitz