1 files changed, 16 insertions, 2 deletions

diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh
index b605c4733f09..8385a6224865 100755
--- a/usr.bin/diff/tests/diff_test.sh
+++ b/usr.bin/diff/tests/diff_test.sh
@@ -11,6 +11,7 @@ atf_test_case brief_format
 atf_test_case b230049
 atf_test_case Bflag
 atf_test_case tabsize
+atf_test_case conflicting_format
 
 simple_body()
 {
@@ -49,8 +50,6 @@ unified_body()
 {
 	atf_check -o file:$(atf_get_srcdir)/unified_p.out -s eq:1 \
 		diff -up -L input_c1.in -L input_c2.in  "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
-	atf_check -o file:$(atf_get_srcdir)/unified_c9999.out -s eq:1 \
-		diff -u -c9999 -L input_c1.in -L input_c2.in "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
 	atf_check -o file:$(atf_get_srcdir)/unified_9999.out -s eq:1 \
 		diff -u9999 -L input_c1.in -L input_c2.in "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
 }
@@ -175,6 +174,20 @@ tabsize_body()
 	    diff -t --tabsize 1 A B
 }
 
+conflicting_format_body()
+{
+	printf "\tA\n" > A
+	printf "\tB\n" > B
+
+	atf_check -s exit:2 -e ignore diff -c -u A B
+	atf_check -s exit:2 -e ignore diff -e -f A B
+	atf_check -s exit:2 -e ignore diff -y -q A B
+	atf_check -s exit:2 -e ignore diff -q -u A B
+	atf_check -s exit:2 -e ignore diff -q -c A B
+	atf_check -s exit:2 -e ignore diff --normal -c A B
+	atf_check -s exit:2 -e ignore diff -c --normal A B
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case simple
@@ -188,4 +201,5 @@ atf_init_test_cases()
 	atf_add_test_case b230049
 	atf_add_test_case Bflag
 	atf_add_test_case tabsize
+	atf_add_test_case conflicting_format 
 }