diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-08-04 21:51:41 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-04 22:02:11 -0700 |
| commit | 84f3de28baf6fc6a91b95fad9a4c5468dec3ea8e (patch) | |
| tree | 37f5cfeb6089582b898d0ae61a54aab323c0bc3c /t/t4013/diff.diff_initial..side | |
| parent | cache-tree: introduce write_index_as_tree() (diff) | |
| download | git-84f3de28baf6fc6a91b95fad9a4c5468dec3ea8e.tar.gz git-84f3de28baf6fc6a91b95fad9a4c5468dec3ea8e.zip | |
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>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions