From: Paul Tan <pyokagan@gmail.com>
Date: Tue, 4 Aug 2015 13:51:41 +0000 (+0800)
Subject: builtin-am: implement --3way
X-Git-Tag: v2.6.0-rc0~77^2~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/84f3de28baf6fc6a91b95fad9a4c5468dec3ea8e?ds=inline;hp=84f3de28baf6fc6a91b95fad9a4c5468dec3ea8e

builtin-am: implement --3way

Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07),
git-am.sh supported the --3way option, and if set, would attempt to do a
3-way merge if the initial patch application fails.

Since 5d86861 (am -3: list the paths that needed 3-way fallback,
2012-03-28), in a 3-way merge git-am.sh would list the paths that needed
3-way fallback, so that the user can review them more carefully to spot
mismerges.

Re-implement the above in builtin/am.c.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---