From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Fri, 05 Oct 2007 11:35:32 GMT
Subject: Re: Question about "git commit -a"
Message-ID: <vpqsl4piykb.fsf@bauges.imag.fr>
In-Reply-To: <47060E98.2090601@op5.se>

Andreas Ericsson <ae@op5.se> writes:

>>> or check which merge- conflicts you've already resolved,
>>
>> At least bzr and baz have this kind of conflict management. It's just
>> a separate file, containing the list of unresolved conflicts.
>
> Can you check them against any revision you want? If so, I'm
> impressed :)

If you mean s/check/diff/, not in a simple way, no. Otherwise, I don't
understand what you mean by "check merge-conflicts you've already
resolved against any revision".

-- 
Matthieu