summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-05-05 13:33:22 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-05 13:33:22 +0900
commit95d67879735cfecfdd85f89e59d993c5b4de8835 (patch)
tree0dd6aaca37286c8b8a36edf5cb3674a0deccde6e /builtin/merge-recursive.c
parentMerge branch 'maint-2.11' into maint (diff)
downloadtgif-95d67879735cfecfdd85f89e59d993c5b4de8835.tar.xz
Git 2.12.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions