From e8dbf2b6df199526a660f81de07d17925cfd8518 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
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/functionname_c.out | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 usr.bin/diff/functionname_c.out

(limited to 'usr.bin/diff/functionname_c.out')

diff --git a/usr.bin/diff/functionname_c.out b/usr.bin/diff/functionname_c.out
new file mode 100644
index 000000000000..b17ce05d04ca
--- /dev/null
+++ b/usr.bin/diff/functionname_c.out
@@ -0,0 +1,11 @@
+--- functionname.in
++++ functionname_c.in
+@@ -6,7 +6,7 @@ doSomethingThenPrintHello(int test)
+ 		return;
+ 	}
+ 
+-	print("goodbye\n");
++	print("hello\n");
+ }
+ 
+ 
-- 
cgit v1.3