diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-27 12:21:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-27 12:21:41 -0700 |
| commit | aa0b816c5dd3f9a56f4b8a27d1e7112a98108b91 (patch) | |
| tree | b005fd590b5e9482901a2e5b166869524a59c298 /builtin/merge-tree.c | |
| parent | 7c696007ca422b9712549f27e17c2d778cb887c4 (diff) | |
| parent | d5c1b7c286b2ad2206afe2f86ae228744bd283fb (diff) | |
| download | git-aa0b816c5dd3f9a56f4b8a27d1e7112a98108b91.tar.gz git-aa0b816c5dd3f9a56f4b8a27d1e7112a98108b91.tar.xz | |
Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maint
An ancient test framework enhancement to allow color was not
entirely correct; this makes it work even when tput needs to read
from the ~/.terminfo under the user's real HOME directory.
* rh/test-color-avoid-terminfo-in-original-home:
test-lib.sh: fix color support when tput needs ~/.terminfo
Revert "test-lib.sh: do tests for color support after changing HOME"
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions