summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-12-03 15:59:45 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-13 14:38:47 -0800
commite2e9dc030cb37619256ec995b05412623043e74c (patch)
treea532a36c4ee668d37beabf4791841e671e71a475 /builtin
parentmerge-ort: add function grouping comments (diff)
downloadtgif-e2e9dc030cb37619256ec995b05412623043e74c.tar.xz
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>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions