summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Mehul Jain <mehul.jain2029@gmail.com>2016-04-02 23:28:28 +0530
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-04 11:07:58 -0700
commit6ddc97c7dc11076be30846c13666e5bc1844629a (patch)
tree74fc83879e3dcc04a71d94a06f245ba196645b66 /mergetools
parentt5520: ensure consistent test conditions (diff)
downloadtgif-6ddc97c7dc11076be30846c13666e5bc1844629a.tar.xz
t5520: use better test to check stderr output
Checking stderr output using test_i18ncmp may lead to test failure as some shells write trace output to stderr when run under 'set -x'. Use test_i18ngrep instead of test_i18ncmp. Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions