From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jun 2012 23:05:37 GMT
Subject: Re: MERGE_RR droppings
Message-ID: <7v8vfk2pby.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CABURp0os2no40BW0P-biG_fXyi7MHRcLLYWmCbLTdBv1o1OXcg@mail.gmail.com>

Phil Hord <phil.hord@gmail.com> writes:

> git mergetool decides to use rerere-remaining based on the existence
> of the .git/MERGE_RR file:
>
>     if test -e "$GIT_DIR/MERGE_RR"

This is correct, I would probably write it with "test -f" if I were
writing this line today, though.  After you commit to conclude the
merge, the MERGE_RR marker should disappear.  Isn't it happening for
you?