From: Ramsay Jones <ramsay@ramsayjones.plus.com>
Date: Thu, 31 Dec 2015 12:23:10 GMT
Subject: Re: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?
Message-ID: <56851E2E.4050403@ramsayjones.plus.com>
In-Reply-To: <CAPig+cQZq-aDYv5G3eNivvqC0eCTfyPtA4gEuop0PWq2LFT=9Q@mail.gmail.com>



On 31/12/15 06:08, Eric Sunshine wrote:
> On Wed, Dec 30, 2015 at 8:20 AM, Torsten Bögershausen <tboegi@web.de> wrote:
>> I got 2 failures on pu under Mac OS, (Linux is OK)
>> I did some very basic debugging, it seems as if grep doesn't find
>> a needed string.
>> Does anybody have an idea here ?
> 
> I'm unable to reproduce these failures on Mac.
> 

This test failed during a short window (due to commit 2bd811ec) and
has already been fixed in commit 3a74ea38 ("notes: allow merging
from arbitrary references", 29-12-2015).

ATB,
Ramsay Jones