summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-19 11:38:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-19 11:38:39 -0700
commit9ee9c9d068d841908c7022aad566096be8a439a9 (patch)
treed85c6f834f3ffb64770eb196f1cca31a01afd84b /notes-merge.h
parentMerge branch 'jc/parseopt-verify-short-name' (diff)
parenttrace: correct trace_strbuf() parameter type for !HAVE_VARIADIC_MACROS (diff)
downloadtgif-9ee9c9d068d841908c7022aad566096be8a439a9.tar.xz
Merge branch 'kb/perf-trace'
Compilation fix for some compilers. * kb/perf-trace: trace: correct trace_strbuf() parameter type for !HAVE_VARIADIC_MACROS
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions