]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 70176b7) | patch
merge-tree: move logic for existing merge into new function
authorElijah Newren <newren@gmail.com>
Sat, 18 Jun 2022 00:20:45 +0000 (00:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jun 2022 23:10:05 +0000 (16:10 -0700)
commit55e48f6bf76f9038eef1a6926533a7c30a53c923
tree98da72afa6ccc491e8782f9c32623b1547482c5btree
parent70176b70156f02bf4345ee091e664430f58ab32bcommit | diff
merge-tree: move logic for existing merge into new function

In preparation for adding a non-trivial merge capability to merge-tree,
move the existing merge logic for trivial merges into a new function.

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