From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Aug 2012 22:00:08 GMT
Subject: Re: [PATCH v2 1/2] test: git-stash conflict sets up rerere
Message-ID: <7vehn6zedz.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CABURp0rrTvQcjHLsVwXC5hfBOuRmFG4AzSj6ZQwM=MXn0FAUCQ@mail.gmail.com>

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.