Thread (2 messages) flat view 2 messages, 2 authors, 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 08:56:25AM -0700, Junio C Hamano wrote:
The only reason I did not do it your way was because we would
need to have three lines per driver (one [merge "foo"] section
per driver, a "driver" line, and a blank line for readability
after that), which at the time I wrote it felt a bit wasteful,
and it was late.
perhaps we can extend the config syntax to also support an entry
on the same line as the category:

	[merge "ancient"] driver=merge...

This would allow an one-line merge driver definition and would play
nice with your [attr] macro definition.

Perhaps we should also add the = to macro definitions?

	[attr] binary=nocrlf nodiff merge=binary

Hmm, but then we would get multiple meanings for "=" on the same line,
so nevermind.

Or use some whitespace:

	[attr] binary = nocrlf nodiff merge=binary

Does this look better?

-- 
Martin Waitz

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help