summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-31 23:03:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-31 23:03:57 -0700
commitb3d7a52fac39193503a0b6728771d1bf6a161464 (patch)
tree2a721d0620e1836d19e09358d4b18680940a75a8 /merge-recursive.h
parentMerge branch 'cb/test-use-ere-for-alternation' (diff)
downloadtgif-b3d7a52fac39193503a0b6728771d1bf6a161464.tar.xz
Git 2.27
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions