From: Junio C Hamano <junkio@cox.net>
Date: Sat, 01 Jul 2006 19:56:07 GMT
Subject: Re: A note on merging conflicts..
Message-ID: <7vzmftcd60.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <44A6CD1D.2000600@lsrfire.ath.cx>

Rene Scharfe <rene.scharfe@lsrfire.ath.cx> writes:

> I wonder why the two clear_commit_marks() calls at the end of
> get_merge_bases() are not sufficient, though.

I missed to notice that Johannes had added those calls there; we
should remove them from get_merge_bases().

The normal case of git-merge-base calling get_merge_bases() once
and exiting should NOT have to pay for the clean-up cost at all.