summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-18 11:17:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-18 11:17:45 -0700
commit531675ad172f984a6dbc2ac840caaf6ba1015eb0 (patch)
treee41b57b30d397304734516d1aef3d3db5d607446 /ll-merge.h
parentMerge branch 'fc/remote-helper-fixes' (diff)
parentconfig.c: mark die_bad_number as NORETURN (diff)
downloadtgif-531675ad172f984a6dbc2ac840caaf6ba1015eb0.tar.xz
Merge branch 'jk/config-die-bad-number-noreturn'
Squelch a false compiler warning from older gcc. * jk/config-die-bad-number-noreturn: config.c: mark die_bad_number as NORETURN
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions