From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Mar 2012 16:20:01 GMT
Subject: Re: Edit a rerere conflict resolution
Message-ID: <7vvcm4h61a.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4F636700.2090105@lyx.org>

Vincent van Ravesteijn <vfr@lyx.org> writes:

> No, I turned rerere.autoupdate off. Proven in the above by the line
> "Resolved... " instead of "Staged...".

Yeah, actually I just tried and the procedure works with or without
autoupdate for me.

So there is something different between our setup (or the nature of the
conflict), but I do not know what it is offhand.