From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 15 Aug 2010 06:59:36 GMT
Subject: Re: Status of conflicted files resolved with rerere
Message-ID: <7veie0gy3r.fsf@alter.siamese.dyndns.org>
In-Reply-To: <D06701C5-E581-46AA-BC7D-3DA7C4127D44@gmail.com>

David Aguilar <davvid@gmail.com> writes:

> Here's what we'd need in order to improve rerere and mergetool  
> interaction:  the ability to answer the question, "has this file been  
> rerere merged?"

I do not quite understand why the user _runs_ mergetool on a file that has
been already merged; isn't it an option not to do so in the first place?

Having said that.

I think you can use the fact that:

 - "ls-files -u" will list paths with conflicts; and

 - "rerere status" won't mention the ones that have been autoresolved

if rerere is in effect (check for presense of .git/MERGE_RR).