| commit | f591c4724615b2fc1e4dc3d6bfe5da96a88eacbe | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 1 Jan 2021 02:34:44 +0000 (1 02:34 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Jan 2021 18:40:45 +0000 (4 10:40 -0800) | ||
| tree | 4aee16ff20e4d4c1350e41c2009242913afc2e5a | treesnapshot (tar.gz zip) |
| parent | 62fdec17a111e419b750938d24b6d65e3076b76d | commitdiff |
merge-ort: copy and adapt merge_3way() from merge-recursive.c
Take merge_3way() from merge-recursive.c and make slight adjustments
based on different data structures (direct usage of object_id
rather diff_filespec, separate pathnames which based on our careful
interning of pathnames in opt->priv->paths can be compared with '!='
rather than 'strcmp').
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Take merge_3way() from merge-recursive.c and make slight adjustments
based on different data structures (direct usage of object_id
rather diff_filespec, separate pathnames which based on our careful
interning of pathnames in opt->priv->paths can be compared with '!='
rather than 'strcmp').
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory |