diff options
author | Elijah Newren <newren@gmail.com> | 2020-12-13 08:04:23 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:18:20 -0800 |
commit | 9fefce68dc85d96781090f86c067d83f7c50b617 (patch) | |
tree | 58f380b91c6a49c4ce596f54e1083ad834e09bbd /commit.c | |
parent | bb470f4e13e90889030d48f618ded5c0961943a3 (diff) |
merge-ort: basic outline for merge_switch_to_result()
This adds a basic implementation for merge_switch_to_result(), though
just in terms of a few new empty functions that will be defined in
subsequent commits.
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