git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 62fdec1)
merge-ort: copy and adapt merge_3way() from merge-recursive.c
authorElijah Newren <redacted>
Fri, 1 Jan 2021 02:34:44 +0000 (02:34 +0000)
committerJunio C Hamano <redacted>
Mon, 4 Jan 2021 18:40:45 +0000 (10:40 -0800)
commitf591c4724615b2fc1e4dc3d6bfe5da96a88eacbe
tree4aee16ff20e4d4c1350e41c2009242913afc2e5atree | snapshot
parent62fdec17a111e419b750938d24b6d65e3076b76dcommit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-ort.c diff | blob | history
git clone https://git.99rst.org/PROJECT