]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5b97a56) | patch
checkout: replace merge_trees() with merge_ort_nonrecursive()
authorElijah Newren <newren@gmail.com>
Tue, 8 Apr 2025 15:48:35 +0000 (15:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2025 20:59:11 +0000 (13:59 -0700)
commitb5dff2bd619d47aa09e757761e5ff72ecb0637b7
tree51887a875c1fef450f578f888d81df571afe71f9tree | snapshot
parent5b97a56fa0e7d580dc8865b73107407c9b3f0effcommit | diff
checkout: replace merge_trees() with merge_ort_nonrecursive()

Replace the use of merge_trees() from merge-recursive.[ch] with the
merge-ort equivalent.

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