diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-23 10:40:06 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-23 11:27:52 -0700 |
commit | b60e88cc780ea54de65b62437afbeb9c857110f2 (patch) | |
tree | 1431cacb282d7a24351a6e26735d84594cee4b43 /mergetools/examdiff | |
parent | 8b0eaa41f2371cafd28324b00128405a80740b16 (diff) | |
download | git-nd/parseopt-completion.tar.gz |
t9902: disable test on the list of merge-strategies under GETTEXT_POISONnd/parseopt-completion
The code to learn the list of merge strategies from the output of
"git merge -s help" forces C locale, so that it can notice the
message shown to indicate where the list starts in the output.
However, GETTEXT_POISON build corrupts its output even when run in
the C locale, and we cannot expect this test to succeed.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/examdiff')
0 files changed, 0 insertions, 0 deletions