summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-05-13 23:40:13 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-13 23:50:35 +0900
commitab15ad1a3b4b04a29415aef8c9afa2f64fc194a2 (patch)
treef32dcb739e770f0d389a55037c7da73a1a8502e5 /merge-recursive.c
parentMerge branch 'jh/trace2' (diff)
downloadtgif-ab15ad1a3b4b04a29415aef8c9afa2f64fc194a2.tar.xz
Git 2.22-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions