From: Junio C Hamano <junkio@cox.net>
Date: Thu, 28 Dec 2006 02:11:26 GMT
Subject: Re: Why git-merge-resolve in git-am?
Message-ID: <7vr6uk3h2p.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20061228014525.GC16612@spearce.org>

Shawn Pearce <spearce@spearce.org> writes:

> Why does git-am use git-merge-resolve while git-rebase -m uses
> git-merge-recursive?

The use of merge-resolve by am predates merge-resolve became
usable by at least six weeks, and longer before merge-resolve
became really stable for about an extra month after.

Even after it stabilized merge-recursive was way slower than
merge-resove until it was rewritten in C for another nine
months.