summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-13 13:30:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-13 13:30:16 -0700
commitfd99e2bda0ca6a361ef03c04d6d7fdc7a9c40b78 (patch)
treea909cc46b4d9b6ab254d6a4214d84b5e7120f837 /builtin/merge-index.c
parentMerge branch 'ad/pull-remote-doc' into maint (diff)
downloadtgif-fd99e2bda0ca6a361ef03c04d6d7fdc7a9c40b78.tar.xz
Prepare for 2.13.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions