From: Junio C Hamano <junkio@cox.net>
Date: Thu, 12 Oct 2006 22:27:30 GMT
Subject: Re: [PATCH] git-revert with conflicts to behave as git-merge with conflicts
Message-ID: <7vejtdkw4t.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20061012215242.16419.qmail@web31810.mail.mud.yahoo.com>

Luben Tuikov <ltuikov@yahoo.com> writes:

> --- a/git-commit.sh
> +++ b/git-commit.sh
> @@ -441,7 +441,7 @@ then
>  elif test "$use_commit" != ""
>  then
>  	git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
> -elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
> +elif test -f "$GIT_DIR/MERGE_MSG"
>  then
>  	cat "$GIT_DIR/MERGE_MSG"
>  elif test -f "$GIT_DIR/SQUASH_MSG"

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.