]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b0ca120) | patch
merge-ort: copy a few small helper functions from merge-recursive.c
authorElijah Newren <newren@gmail.com>
Wed, 16 Dec 2020 22:28:00 +0000 (22:28 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Dec 2020 05:56:39 +0000 (21:56 -0800)
commit4296d8f17d45465c9712fab099a1a6787a8e9913
tree4249eb4ebb468246cfba73153ca2242c822f841atree | snapshot
parentb0ca120554be8d8f7faf98aa3b991441de76f5cfcommit | diff
merge-ort: copy a few small helper functions from merge-recursive.c

In a subsequent commit, we will implement the traditional recursiveness
that gave merge-recursive its name, namely merging non-unique
merge-bases to come up with a single virtual merge base.  Copy a few
helper functions from merge-recursive.c that we will use in the
implementation.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.