diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:05 -0700 |
| commit | 70176b70156f02bf4345ee091e664430f58ab32b (patch) | |
| tree | de22bd7e35220733dd22a94c9648250d8127933c /git.c | |
| parent | f770e9f396d48b567ef7b37d273e91ad570a3522 (diff) | |
| download | git-70176b70156f02bf4345ee091e664430f58ab32b.tar.gz | |
merge-tree: rename merge_trees() to trivial_merge_trees()
merge-recursive.h defined its own merge_trees() function, different than
the one found in builtin/merge-tree.c. That was okay in the past, but
we want merge-tree to be able to use the merge-ort functions, which will
end up including merge-recursive.h. Rename the function found in
builtin/merge-tree.c to avoid the conflict.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions