From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sat, 05 Jun 2010 23:57:24 GMT
Subject: Re: What's cooking in git.git (Jun 2010, #01; Wed, 2)
Message-ID: <AANLkTimKwCDlW_uaCusZcmV2IttqORlUwSqkVnD3no6q@mail.gmail.com>
In-Reply-To: <7v39x1z72z.fsf@alter.siamese.dyndns.org>

Heya,

On Sat, Jun 5, 2010 at 20:07, Junio C Hamano <gitster@pobox.com> wrote:
>> That patch (d1b1a919) breaks merge-one-file when run outside the test
>> suite as far as I can tell.
>
> Thanks for catching.  I wonder if something like this would be better in
> that it wouldn't break people who do not use custom "DIFF" while it would
> help people who do at the same time...
>
>  Makefile              |    2 ++
>  git-merge-one-file.sh |    2 +-

No addition to the test suite to catch this in the future?


-- 
Cheers,

Sverre Rabbelier