summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-21 14:07:08 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-21 14:07:08 +0900
commit95a731ce92c7576d927f0d8a9b27c206cb58c2e6 (patch)
tree41ab1a88e854fce66bda9527bdfa28e5b8fbf3d7 /merge-recursive.c
parentMerge branch 'rs/sequencer-rewrite-file-cleanup' into maint (diff)
downloadtgif-95a731ce92c7576d927f0d8a9b27c206cb58c2e6.tar.xz
Almost ready for 2.15.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions