summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-12-06 09:10:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-12-06 09:10:35 -0800
commit3013dff8662eae06457fe6e5348dfe2270810ab2 (patch)
treed35df35b9733badb3aa86000132595b6668172ae /merge-recursive.c
parentMerge branch 'jc/merge-base-fork-point-doc' into maint (diff)
downloadtgif-3013dff8662eae06457fe6e5348dfe2270810ab2.tar.xz
Prepare for 2.15.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions