diff options
author | Jeff King <peff@peff.net> | 2017-10-03 09:44:27 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-04 11:32:56 +0900 |
commit | c5bdfe677cfab5b2e87771c35565d44d3198efda (patch) | |
tree | 11772dade47b76afdef24c6a25558e6f7359dc1c /Documentation/git-merge-one-file.txt | |
parent | t7502: use diff.noprefix for --verbose test (diff) | |
download | tgif-c5bdfe677cfab5b2e87771c35565d44d3198efda.tar.xz |
t6006: drop "always" color config tests
We test the %C() format placeholders with a variety of
color-inducing options, including "--color" and
"-c color.ui=always". In preparation for the behavior of
"always" changing, we need to do something with those
"always" tests.
We can drop ones that expect "always" to turn on color even
to a file, as that will become a synonym for "auto", which
is already tested.
For the "--no-color" test, we need to make sure that color
would otherwise be shown. To do this, we can use
test_terminal, which enables colors in the default setup.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions