diff options
| author | Elijah Newren <newren@gmail.com> | 2025-04-08 15:48:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 13:59:11 -0700 |
| commit | b5dff2bd619d47aa09e757761e5ff72ecb0637b7 (patch) | |
| tree | 51887a875c1fef450f578f888d81df571afe71f9 /commit.c | |
| parent | 5b97a56fa0e7d580dc8865b73107407c9b3f0eff (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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions