From: Shawn Pearce <spearce@spearce.org>
Date: Thu, 28 Dec 2006 01:45:25 GMT
Subject: Why git-merge-resolve in git-am?
Message-ID: <20061228014525.GC16612@spearce.org>

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

Can we just change git-am to use git-merge-recursive instead?
For one thing its faster, for another it supports the GITHEAD_*
feature for naming the hunks in a conflict.

-- 
Shawn.