[PATCH 0/2] Custom low-level merge driver support. · Junio C Hamano <hidden> · 2016-06-15
[PATCH 1/2] Custom low-level merge driver support. · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 1/2] Custom low-level merge driver support. · Johannes Sixt <hidden> · 2016-06-15
Re: [PATCH 1/2] Custom low-level merge driver support. · Johannes Schindelin <hidden> · 2016-06-15
[PATCH 2/2] Allow the default low-level merge driver to be configured. · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 0/2] Custom low-level merge driver support. · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 0/2] Custom low-level merge driver support. · Martin Waitz <hidden> · 2016-06-15
Re: [PATCH 0/2] Custom low-level merge driver support. · Linus Torvalds <torvalds@linux-foundation.org> · 2016-06-15

Re: [PATCH 0/2] Custom low-level merge driver support.

From: Martin Waitz <hidden>
Date: 2016-06-15 22:43:05

hoi :)

On Wed, Apr 18, 2007 at 12:48:48PM +0200, Johannes Schindelin wrote:

On Wed, 18 Apr 2007, Junio C Hamano wrote:

quoted

	[merge]
		driver = ancient merge %A %O %B

Why not do something like

	[merge.driver]
		ancient = merge %A %O %B

or

[merge "ancient"]
	driver = merge %A %O %B

-- 
Martin Waitz

Attachments

signature.asc [application/pgp-signature] 189 bytes