From: Junio C Hamano <junkio@cox.net>
Date: Wed, 18 Apr 2007 21:01:41 GMT
Subject: Re: [PATCH 0/2] Custom low-level merge driver support.
Message-ID: <7vfy6xflca.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.63.0704181304220.2806@qynat.qvtvafvgr.pbz>

David Lang <david.lang@digitalinsight.com> writes:

> On Wed, 18 Apr 2007, Linus Torvalds wrote:
>
> I could also see having one external program that can handle the
> different types of files and/or merges. rather than having a different
> line for each would it make sense to add another variable that could
> be handed to the merge program that would tell it what sort of merge
> to do?

That was the direction I was thinking about.