summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-04-16 19:28:10 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-16 19:28:10 +0900
commite9bd21c3373278a9eabaf20cb60dbb6aa694e37e (patch)
tree9ad94b7ba9d3db3a9ec3666336c58742cc907c95 /Documentation/git-merge-file.txt
parentMerge branch 'tz/completion' (diff)
parenttrace2: NULL is not allowed for va_list (diff)
downloadtgif-e9bd21c3373278a9eabaf20cb60dbb6aa694e37e.tar.xz
Merge branch 'tb/trace2-va-list-fix'
Fix some code that passed a NULL when a va_list was expected. * tb/trace2-va-list-fix: trace2: NULL is not allowed for va_list
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions