summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-05-05 12:56:19 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-05 12:56:19 +0900
commit70fcaef90bad282cf141a7c2e7ae87b13fe0700e (patch)
tree076f9699f91e78514fa616e66febcc1c16e9d430 /merge-recursive.c
parentMerge branch 'maint-2.5' into maint-2.6 (diff)
downloadtgif-70fcaef90bad282cf141a7c2e7ae87b13fe0700e.tar.xz
Git 2.6.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions