Re: How to install and use a custom merge driver

From: Jeff King <peff@peff.net>
Date: Jan 29, 2009, 05:03 UTC
Message-ID: <20090129050348.GA31202@coredump.intra.peff.net>
In-Reply-To: <loom.20090129T044425-689@post.gmane.org>

On Thu, Jan 29, 2009 at 04:47:19AM +0000, Alec Clews wrote:

> It appears that TAB is not supported as white space in either attributes or 
> config files? I removed all the tabs and it works as described on the box

That's odd. It should be fine. And if I repeat the test I posted with:

  printf '*\tmerge=overwrite\n' >.git/info/attributes
  (printf '[merge "overwrite"]\n'
   printf '\tname = overwrite using cp\n'
   printf '\tdriver = cp %%B %%A\n'
  ) >>.git/config

it works as before.

What git version are you using? Can you post a shell snippet that breaks reliably?

-Peff