From: Junio C Hamano <junkio@cox.net>
Date: Fri, 13 Oct 2006 00:07:57 GMT
Subject: Re: [PATCH] git-revert with conflicts to behave as git-merge with conflicts
Message-ID: <7vvempjcwy.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20061012231503.78452.qmail@web31803.mail.mud.yahoo.com>

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?