Shawn O. Pearce 579c9bb198 Use merge-recursive in git-am -3. ...

By switching from merge-resolve to merge-recursive in the 3-way
fallback behavior of git-am we gain a few benefits:

 * renames are automatically handled, like in rebase -m;
 * conflict hunks can reference the patch name;
 * its faster on Cygwin (less forks).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

2006-12-28 19:06:16 -08:00

11 KiB

Executable File

Raw Blame History

View Raw