3 files changed, 40 insertions, 1 deletions

diff --git a/usr.bin/diff/tests/Makefile b/usr.bin/diff/tests/Makefile
index 295e3141f3d9c..3fa234f3d5150 100644
--- a/usr.bin/diff/tests/Makefile
+++ b/usr.bin/diff/tests/Makefile
@@ -22,7 +22,8 @@ ${PACKAGE}FILES+=	\
 	unified_9999.out \
 	header.out \
 	header_ns.out \
-	ifdef.out
+	ifdef.out \
+	group-format.out
 
 NETBSD_ATF_TESTS_SH+=	netbsd_diff_test
 
diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh
index 589bc9a8603b9..62ca8277c5f36 100755
--- a/usr.bin/diff/tests/diff_test.sh
+++ b/usr.bin/diff/tests/diff_test.sh
@@ -5,6 +5,7 @@ atf_test_case unified
 atf_test_case header
 atf_test_case header_ns
 atf_test_case ifdef
+atf_test_case group_format
 
 simple_body()
 {
@@ -78,6 +79,15 @@ ifdef_body()
 		"$(atf_get_srcdir)/input_c2.in"
 }
 
+group_format_body()
+{
+	atf_check -o file:$(atf_get_srcdir)/group-format.out -s eq:1 \
+		diff --changed-group-format='<<<<<<< (local)
+%<=======
+%>>>>>>>> (stock)
+' "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case simple
@@ -85,4 +95,5 @@ atf_init_test_cases()
 	atf_add_test_case header
 	atf_add_test_case header_ns
 	atf_add_test_case ifdef
+	atf_add_test_case group_format
 }
diff --git a/usr.bin/diff/tests/group-format.out b/usr.bin/diff/tests/group-format.out
new file mode 100644
index 0000000000000..4e1bf85fbba7c
--- /dev/null
+++ b/usr.bin/diff/tests/group-format.out
@@ -0,0 +1,27 @@
+/*
+ * A comment 
+ *
+<<<<<<< (local)
+ * And another  bla
+=======
+ * And another bla
+>>>>>>> (stock)
+ *
+<<<<<<< (local)
+ * And yet another
+=======
+ * and yet another
+>>>>>>> (stock)
+ */
+
+int
+main(void)
+{
+<<<<<<< (local)
+=======
+
+>>>>>>> (stock)
+	printf("something");
+
+	return (0);
+}