Subject: Why git-merge-resolve in git-am?

From: Shawn Pearce <[email-masked]>
Date: Wed, 27 Dec 2006 20:45:25 -0500

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.