From e8dbf2b6df199526a660f81de07d17925cfd8518 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Sat, 14 Feb 2026 17:57:42 -0800 Subject: Add files missed in 56a7ce8416d181a2060d7a42 Skip usr.bin/diff3 tests as these contain text that gets misinterpreted as merge conflict markers and blocks push with the relevant pre-receive hook. PR: 293186 --- usr.bin/diff/header.out | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 usr.bin/diff/header.out (limited to 'usr.bin/diff/header.out') diff --git a/usr.bin/diff/header.out b/usr.bin/diff/header.out new file mode 100644 index 000000000000..2e1665a30e6d --- /dev/null +++ b/usr.bin/diff/header.out @@ -0,0 +1,4 @@ +--- empty 2015-04-03 01:02:03.000000000 +0000 ++++ hello 2016-12-22 11:22:33.000000000 +0000 +@@ -0,0 +1 @@ ++hello -- cgit v1.3