summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-17 13:26:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-17 13:26:27 -0700
commit720265749d905ab8da275f18abc42b2dac751dff (patch)
treee5452fc4810a8b7b04c4bd9bee62b4ed3f686973 /builtin/merge-recursive.c
parentMerge branch 'sb/submodule-config-doc-drop-path' (diff)
downloadtgif-720265749d905ab8da275f18abc42b2dac751dff.tar.xz
Tenth batch for 2.11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions