summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-12-17 11:18:45 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-17 11:18:45 -0800
commit5c8213a7696b3d9e29feda2516e350d03d7bd9a4 (patch)
tree8b6b708d41fcdd3e233ff226268331dd7250bed3 /builtin/merge.c
parentMerge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5 (diff)
downloadtgif-5c8213a7696b3d9e29feda2516e350d03d7bd9a4.tar.xz
Git 1.8.5.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions