From: Luben Tuikov <ltuikov@yahoo.com>
Date: Fri, 13 Oct 2006 00:31:20 GMT
Subject: Re: [PATCH] git-revert with conflicts to behave as git-merge with conflicts
Message-ID: <20061013003120.98769.qmail@web31813.mail.mud.yahoo.com>
In-Reply-To: <7vvempjcwy.fsf@assigned-by-dhcp.cox.net>

--- Junio C Hamano <junkio@cox.net> wrote:
> Luben Tuikov <ltuikov@yahoo.com> writes:
> 
> >> If you rely on MERGE_MSG then you would need to clean it after
> >> commit is done.  Currently it does not and checks MERGE_HEAD,
> >> and cleans up MERGE_HEAD when it is done.  MERGE_MSG is not
> >> cleaned.
> >
> > It is cleaned in the lines of the patch you deleted, the section
> > just after the "elif" above:
> 
> Ok, so I can apply that original one with your 'Oops' rolled
> into one patch?

Yes please.

    Luben