summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-08-27 16:23:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-27 16:23:54 -0700
commitbb34ca5c5f7df33ea84a5b71621dbdeac1da39c1 (patch)
treeb098a3292b4c32dae69cf6385d7faa0a33d47d14 /merge-recursive.h
parentMake it possible to abort the submission of a change to Perforce (diff)
parentctype.c: protect tiny C preprocessor constants (diff)
downloadtgif-bb34ca5c5f7df33ea84a5b71621dbdeac1da39c1.tar.xz
Merge branch 'maint'
* maint: ctype.c: protect tiny C preprocessor constants index-pack: be careful after fixing up the header/footer
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions