diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:05 -0700 |
| commit | 55e48f6bf76f9038eef1a6926533a7c30a53c923 (patch) | |
| tree | 98da72afa6ccc491e8782f9c32623b1547482c5b /git.c | |
| parent | 70176b70156f02bf4345ee091e664430f58ab32b (diff) | |
| download | git-55e48f6bf76f9038eef1a6926533a7c30a53c923.tar.gz | |
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>
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions