summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-07-08 13:15:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-08 13:15:03 -0700
commit83ae1edff7ee0b7674bd556955d2cf1706bddb21 (patch)
tree53adb04bd2575623bb34cd9f31258f8e8be6e15a /ll-merge.c
parentMerge branch 'ar/more-typofix' (diff)
parenttest-lib.sh: set COLUMNS=80 for --verbose repeatability (diff)
downloadtgif-83ae1edff7ee0b7674bd556955d2cf1706bddb21.tar.xz
Merge branch 'ab/fix-columns-to-80-during-tests'
Output from some of our tests were affected by the width of the terminal that they were run in, which has been corrected by exporting a fixed value in the COLUMNS environment. * ab/fix-columns-to-80-during-tests: test-lib.sh: set COLUMNS=80 for --verbose repeatability
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions