From: Phil Hord <phil.hord@gmail.com>
Date: Fri, 17 Aug 2012 17:52:07 GMT
Subject: Re: [PATCH v2 1/2] test: git-stash conflict sets up rerere
Message-ID: <CABURp0rdZ2N6exE0gpJncSnTzGB0Hbr+RuO4G5F6zb=z8Qb0Sg@mail.gmail.com>
In-Reply-To: <7vehn6zedz.fsf@alter.siamese.dyndns.org>

On Thu, Aug 16, 2012 at 6:00 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Phil Hord <phil.hord@gmail.com> writes:
>
>> So, the next roll will remove the tests for MERGE_RR and will be more
>> explicit about the potential for mergetool confusion and/or the fact
>> that it is not explicitly tested here.
>>
>> I'll wait a little longer for any further comments.
>
> Mild ping to a seemingly stalled topic.

I was going to say the same thing.

Patch v3 series is here:
http://permalink.gmane.org/gmane.comp.version-control.git/201282
http://permalink.gmane.org/gmane.comp.version-control.git/201283

I assume these were missed because I sent them during some critical
point in the release cycle.  But maybe it was because I missed some
step in the submission-revision protocol.  If the latter, please let
me know and I will try to learn to do better next time.

Phil ~ resent due to missed ReplyAll button