diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-01-01 02:34:44 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-04 10:40:45 -0800 |
| commit | f591c4724615b2fc1e4dc3d6bfe5da96a88eacbe (patch) | |
| tree | 4aee16ff20e4d4c1350e41c2009242913afc2e5a /base85.c | |
| parent | merge-ort: flesh out implementation of handle_content_merge() (diff) | |
| download | tgif-f591c4724615b2fc1e4dc3d6bfe5da96a88eacbe.tar.xz | |
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>
Diffstat (limited to 'base85.c')
0 files changed, 0 insertions, 0 deletions