From nobody Sun Mar 22 08:05:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fdplR2Nvwz6W97k for ; Sun, 22 Mar 2026 08:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdplR07sHz3Z0N for ; Sun, 22 Mar 2026 08:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LR4/GzWYtTl/AXCbeB/LnIPbyx467nqRS+BxblxtWJE=; b=Nb6yuS37fVjXz+sprQtlbfdng3Fx9uE2q9nI7pC72Vk+vBZf4+UbOw8d1SGqb/pXvaNLjQ J3mYwllBkm6WLyV2QmBv8T6JvR0jQHu+iBKx5GpThhtg3ANmIEU2B+v00pa4RG6f5HRWDs PBLipkB+YK+TtT0wQGROR5W/xa8GHqfVs6hsUdHIRNCgzXwhLGKt4pXjsTFAfqwPkbIZg7 9fxcT2uip5mnfW04rtVOKTS0h7G9SQFrYVSzISzOMuoaPsrEE1n2xe2OCC/5WsbtXipg9l 77yGDz/K540F7nWx0loWMUUuuEVU8AHENc/1V0n739e+wrjvdozcES+ZOrzSfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166755; a=rsa-sha256; cv=none; b=tUsjPly3sWKcnr/JSjQDHOMQqnw2F2vsRRFpCQsfTPAG+lSeaERsLzCp8jnf5kJiDT4epf iOHPW514X+r6uE/7n/hKvZ4r0c2vxyziZNfm0p+EOWxEITy+zJm1boqJHku6JFNFJAHW1Z 7Ivw+V4AXWVmChCe0Inc0xbLC67JpQiEt/8iuNbXK6pMrOdPph4HFGAH1oCK7w2ql+2QlV SE42b4CQRWhlQTPR/Vj8ODa0XtLpAmuu9zUkMVHk4d7kqfaJkSkghqtl8cxQlCqtqyFJeb 4Wh+M8vNsUPDudM/WAk3Rl+xllqr19mU9qcDrtA6+sAFeNbapJWsEbdNlx9/Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LR4/GzWYtTl/AXCbeB/LnIPbyx467nqRS+BxblxtWJE=; b=X9wTKSJZSZen+pst5qeeoJeUUDnqrSGQg6A8cAke0nNGLjGh090HCT3OBZVqJp3qTrhot8 p9jV/9DPT3yoWY9XPYl18KNhkDLBTI/BTj1EJBOBTLmEZRK2zXqipdkDiTCD2QPRdhtY3N tVnhp49lL07Bsp5QNHLbrGlL23QhhMa88tJifnmRmrjbOwM8LtBIVr/uwqH+Dh6fE8Khy3 jEMc9EWuVPkFnfphmlVOj7UQBpGbyscuNlaLOnLPc1jT7GvXFkNiukyWlT9q6yMLPU8wCc OkHERmNMJN25Xs0pYcWaIDGV/0+m6Bwr0D9c0OYfzG4agn1T0J7aKRf72sjb3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplQ64TWzrQd for ; Sun, 22 Mar 2026 08:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a4da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 1449573b44c7 - stable/15 - diff3: add 3 missing files from the testsuite List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1449573b44c721586261ead3f2e146736f092bcd Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:54 +0000 Message-Id: <69bfa2e2.1a4da.790825e5@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1449573b44c721586261ead3f2e146736f092bcd commit 1449573b44c721586261ead3f2e146736f092bcd Author: Baptiste Daroussin AuthorDate: 2026-02-13 17:45:39 +0000 Commit: Dag-Erling Smørgrav 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.txt