Date: Sun, 22 Mar 2026 08:05:54 +0000 From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin <bapt@FreeBSD.org> Subject: git: 1449573b44c7 - stable/15 - diff3: add 3 missing files from the testsuite Message-ID: <69bfa2e2.1a4da.790825e5@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1449573b44c721586261ead3f2e146736f092bcd commit 1449573b44c721586261ead3f2e146736f092bcd Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2026-02-13 17:45:39 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2026-03-22 02:04:58 +0000 diff3: add 3 missing files from the testsuite Fixes: 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b (cherry picked from commit 284a0aa96eb63f12831a9e06514a50b2cd80957f) --- 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.txthome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bfa2e2.1a4da.790825e5>