git: 284a0aa96eb6 - main - diff3: add 3 missing files from the testsuite

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=284a0aa96eb63f12831a9e06514a50b2cd80957f

commit 284a0aa96eb63f12831a9e06514a50b2cd80957f
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2026-02-13 17:45:39 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2026-02-13 19:26:02 +0000

    diff3: add 3 missing files from the testsuite
    
    Fixes:  2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b
---
 usr.bin/diff3/tests/conflict-Em.out    | 19 +++++++++++++++++++
 usr.bin/diff3/tests/conflict-merge.out | 25 +++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/usr.bin/diff3/tests/conflict-Em.out b/usr.bin/diff3/tests/conflict-Em.out
new file mode 100644
index 000000000000..dcc1ddaff6fb
--- /dev/null
+++ b/usr.bin/diff3/tests/conflict-Em.out
@@ -0,0 +1,19 @@
+<<<<<<< conflict3.txt
+root:someone@example.com
+=======
+#root:me@my.domain
+>>>>>>> conflict2.txt
+
+<<<<<<< conflict3.txt
+#Basicsystemaliases--theseMUSTbepresent
+MAILER-DAEMON:postmaster
+postmaster:root
+=======
+#Basicsystemaliases--theseMUSTbepresent
+MAILER-DAEMON:postmaster
+postmaster:root
+
+#Generalredirectionsforpseudoaccounts
+_dhcp:root
+_pflogd:root
+>>>>>>> conflict2.txt
diff --git a/usr.bin/diff3/tests/conflict-merge.out b/usr.bin/diff3/tests/conflict-merge.out
new file mode 100644
index 000000000000..737cba7dc224
--- /dev/null
+++ b/usr.bin/diff3/tests/conflict-merge.out
@@ -0,0 +1,25 @@
+<<<<<<< conflict3.txt
+root:someone@example.com
+||||||| conflict1.txt
+# root: me@my.domain
+=======
+#root:me@my.domain
+>>>>>>> conflict2.txt
+
+<<<<<<< conflict3.txt
+#Basicsystemaliases--theseMUSTbepresent
+MAILER-DAEMON:postmaster
+postmaster:root
+||||||| conflict1.txt
+# Basic system aliases -- these MUST be present
+MAILER-DAEMON: postmaster
+postmaster: root
+=======
+#Basicsystemaliases--theseMUSTbepresent
+MAILER-DAEMON:postmaster
+postmaster:root
+
+#Generalredirectionsforpseudoaccounts
+_dhcp:root
+_pflogd:root
+>>>>>>> conflict2.txt