diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-06-11 18:22:05 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-14 15:36:33 -0700 |
| commit | a12ffe5b65b88f5e01d6c712a29c4b1dcd09be51 (patch) | |
| tree | 65ac7c0b439846522934e646190f8226267ee862 /builtin/add.c | |
| parent | 685152b0984d0bf24798eb81711204a70d3e401f (diff) | |
| download | git-pt/am-in-C.tar.gz | |
am: implement 3-way mergept/am-in-C
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am
supported the --3way option, and if set, would attempt to do a 3-way
merge if the initial patch application fails. Re-implement this feature
through the fall_back_threeway() function.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Diffstat (limited to 'builtin/add.c')
0 files changed, 0 insertions, 0 deletions