projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bb470f4) | patch
merge-ort: basic outline for merge_switch_to_result()
authorElijah Newren <newren@gmail.com>
Sun, 13 Dec 2020 08:04:23 +0000 (08:04 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Dec 2020 22:18:20 +0000 (14:18 -0800)
commit9fefce68dc85d96781090f86c067d83f7c50b617
tree58f380b91c6a49c4ce596f54e1083ad834e09bbdtree | snapshot
parentbb470f4e13e90889030d48f618ded5c0961943a3commit | 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>
merge-ort.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.