From: Jeff King <peff@peff.net>
Date: Thu, 29 Jan 2009 07:11:58 GMT
Subject: Re: How to install and use a custom merge driver
Message-ID: <20090129071158.GA554@coredump.intra.peff.net>
In-Reply-To: <49815423.8000902@gmail.com>

On Thu, Jan 29, 2009 at 06:00:51PM +1100, Alec Clews wrote:

> The problem appears to be spaces around '=' in the attributes file. This  
> fails for me
> [...]
> echo '* merge = overwrite' >.git/info/attributes

Ah, OK. That isn't supposed to work. The attributes are whitespace
separated, and some don't even have an equals at all (e.g., "merge",
"-merge", and "merge=foo" are all valid). So that parses to "please use
the ordinary text merge driver", and some attributes that nobody uses
called "=" and "overwrite".

-Peff