summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-03-16 02:00:49 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-16 12:44:59 -0700
commitc6c8d0b797e33ce1f22d50b46d9c6eba91ed2cbc (patch)
tree1130feebbf16b3bb00360fa0935af720c6460344 /Documentation/merge-options.txt
parentenums: omit trailing comma for portability (diff)
downloadtgif-c6c8d0b797e33ce1f22d50b46d9c6eba91ed2cbc.tar.xz
compat: make gcc bswap an inline function
Without this change, gcc -pedantic warns: cache.h: In function 'ce_to_dtype': cache.h:270:21: warning: ISO C forbids braced-groups within expressions [-pedantic] An inline function is more readable anyway. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions