diff options
Diffstat (limited to 'usr.bin/diff3/tests/diff3_test.sh')
| -rwxr-xr-x | usr.bin/diff3/tests/diff3_test.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/diff3/tests/diff3_test.sh b/usr.bin/diff3/tests/diff3_test.sh index c30f258128af..37a493cfefd5 100755 --- a/usr.bin/diff3/tests/diff3_test.sh +++ b/usr.bin/diff3/tests/diff3_test.sh @@ -62,8 +62,7 @@ diff3_merge_body() { atf_check -s exit:1 -o file:$(atf_get_srcdir)/9.out \ diff3 -m -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt - atf_check -s exit:1 -o file:$(atf_get_srcdir)/tao-merge.out \ - diff3 -m -L lao.txt -L tzu.txt -L tao.txt $(atf_get_srcdir)/lao.txt $(atf_get_srcdir)/tzu.txt $(atf_get_srcdir)/tao.txt + atf_check -s exit:1 -o file:$(atf_get_srcdir)/long-merge.out \ diff3 -m -L long-m.txt -L long-o.txt -L long-y.txt $(atf_get_srcdir)/long-m.txt $(atf_get_srcdir)/long-o.txt $(atf_get_srcdir)/long-y.txt } |