summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-30 14:14:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-30 14:14:32 -0700
commitb14f27f91770e0f99f64135348977a0ce1c7993a (patch)
treea4e202ae73c28f9e048256f66d17af10d88a9668 /builtin/merge-index.c
parentMerge branch 'jk/make-coccicheck-detect-errors' (diff)
downloadtgif-b14f27f91770e0f99f64135348977a0ce1c7993a.tar.xz
Tenth batch for 2.13
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions