summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-23 14:43:09 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-23 14:43:09 +0900
commite3cf08361ae5a277d4cdfbd923f63e8c18634032 (patch)
tree616e3f43da913ed92155fd16ee6b47f02b7b51f3 /merge.c
parentMerge branch 'nr/diff-highlight-indent-fix' (diff)
parenttest-progress: fix test failures on big-endian systems (diff)
downloadtgif-e3cf08361ae5a277d4cdfbd923f63e8c18634032.tar.xz
Merge branch 'sg/progress-fix'
Byte-order fix the recent update to progress display code. * sg/progress-fix: test-progress: fix test failures on big-endian systems
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions