[PATCH 1/4] Allow more than true/false to attributes. · Junio C Hamano <hidden> · 2016-06-15
[PATCH 2/4] merge-recursive: separate out xdl_merge() interface. · Junio C Hamano <hidden> · 2016-06-15
[PATCH 3/4] Allow specifying specialized merge-backend per path. · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 3/4] Allow specifying specialized merge-backend per path. · Linus Torvalds <torvalds@linux-foundation.org> · 2016-06-15
[PATCH 4/4] Add a demonstration/test of customized merge. · Junio C Hamano <hidden> · 2016-06-15

Re: [PATCH 3/4] Allow specifying specialized merge-backend per path.

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: 2016-06-15 22:43:05


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