diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:06 -0700 |
| commit | 32d62802266328f0beb8aede853f6e25e8cbc00f (patch) | |
| tree | fa98f0774d67be3b61e59d4a9e313b34a5489fac /t/t7610-mergetool.sh | |
| parent | Merge branch 'dd/document-log-decorate-default' (diff) | |
| parent | pager: avoid setting COLUMNS when we're guessing its value (diff) | |
| download | tgif-32d62802266328f0beb8aede853f6e25e8cbc00f.tar.xz | |
Merge branch 'js/stop-exporting-bogus-columns'
When we cannot figure out how wide the terminal is, we use a
fallback value of 80 ourselves (which cannot be avoided), but when
we run the pager, we export it in COLUMNS, which forces the pager
to use the hardcoded value, even when the pager is perfectly
capable to figure it out itself. Stop exporting COLUMNS when we
fall back on the hardcoded default value for our own use.
* js/stop-exporting-bogus-columns:
pager: avoid setting COLUMNS when we're guessing its value
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions