projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 04af187) | patch
merge-ort: add die-not-implemented stub handle_content_merge() function
authorElijah Newren <newren@gmail.com>
Thu, 3 Dec 2020 15:59:45 +0000 (15:59 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Dec 2020 22:38:47 +0000 (14:38 -0800)
commite2e9dc030cb37619256ec995b05412623043e74c
treea532a36c4ee668d37beabf4791841e671e71a475tree | snapshot
parent04af1879b9313a83aea46791bad8963e14e7651ecommit | diff
merge-ort: add die-not-implemented stub handle_content_merge() function

This simplistic and weird-looking patch is here to facilitate future
patch submissions.  Adding this stub allows rename detection code to
reference it in one patch series, while a separate patch series can
define the implementation, and then both series can merge cleanly and
work nicely together at that point.

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.