summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-03-12 14:36:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-12 14:36:00 -0700
commit30e9940356dc67959877f4b2417da33ebdefbb79 (patch)
tree5ef1b4caff695eb08863c89054cb80910dc2db31 /merge-recursive.c
parentMerge branch 'en/rebase-backend' (diff)
downloadtgif-30e9940356dc67959877f4b2417da33ebdefbb79.tar.xz
Hopefully the final batch before -rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions