From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Apr 2007 15:16:13 GMT
Subject: Re: [PATCH 3/4] Allow specifying specialized merge-backend per path.
Message-ID: <Pine.LNX.4.64.0704170815500.5473@woody.linux-foundation.org>
In-Reply-To: <11767973191314-git-send-email-junkio@cox.net>



On Tue, 17 Apr 2007, Junio C Hamano wrote:
>
> This allows 'merge' attribute to control how the file-level
> three-way merge is done per path.

Cool. Good job. The whole attribute thing seems to be really working out.

		Linus