diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:50 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:50 +0900 |
| commit | e18b1df299a82c8edc262091dc0b77b1f13c5f0b (patch) | |
| tree | e3b523923d3905c58cf649d6027fc5544518fded /xdiff/xmerge.c | |
| parent | Merge branch 'sg/travis-fixes' into maint (diff) | |
| parent | column: do not include pager.c (diff) | |
| download | tgif-e18b1df299a82c8edc262091dc0b77b1f13c5f0b.tar.xz | |
Merge branch 'kd/auto-col-with-pager-fix' into maint
"auto" as a value for the columnar output configuration ought to
judge "is the output consumed by humans?" with the same criteria as
"auto" for coloured output configuration, i.e. either the standard
output stream is going to tty, or a pager is in use. We forgot the
latter, which has been fixed.
* kd/auto-col-with-pager-fix:
column: do not include pager.c
column: show auto columns when pager is active
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions