From: Junio C Hamano Date: Sat, 01 Jul 2006 18:37:45 GMT Subject: Re: A note on merging conflicts.. Message-ID: <7vfyhldvd2.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20060701150926.GA25800@lsrfire.ath.cx> I suspect this has the same problem I pointed out to Kristian's attempt to make git-branch a built-in. Subject: Re: [PATCH] Implement git-branch and git-merge-base as built-ins. Date: Thu, 08 Jun 2006 11:53:48 -0700 Message-ID: <7vverbsclf.fsf@assigned-by-dhcp.cox.net> Namely, merge-base code is not set up to be called more than once without cleaning things up.