From nobody Fri Feb 13 19:26:08 2026 X-Original-To: dev-commits-src-main@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 4fCMbN4TGWz6RfMp for ; Fri, 13 Feb 2026 19:26:08 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCMbN29Qqz3F1C for ; Fri, 13 Feb 2026 19:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771010768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7S/kH9gnPQURuyJ3s7gMgbSp309M3g33fU6MfJHAxrg=; b=KFZXam6iHDcGJRkHaGTzP7sGvI4eKgS7bHTxmxzyKlfytlCp1GRWKQcaL6ELRZqRUgFX6F +M7e6Hh25pWd20BffOnFzR3q8rw/LNoZn/SaGle4F30lGFPzI0nLMoDYwMj2vgppET73rv pWOS2buh+QdiRLcNBwq3006FGWiJWSzWerT0GNsY1hEc+5GHbA1NOXJ46nXGTHwl4E6kbL hFqwcIQgQ+dsuaur647kfOOKfUryxBe2MKc2vwgi8WpJ4Mn1D/Rom706LkgL+Hwo4HkDCk 2PFqRcF7CujoVAiPuTrxjp6ynCvVW4bfM1tczvLmwOfnNABCEL/9Lla8RAHorQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771010768; a=rsa-sha256; cv=none; b=h6Kr+S/so8ClHIFzqRdo77jd2UhwoQ7qn/C7MiuA2QHh4LY4i/bOFiSmaKifI/lRKK5eaJ 4ni6LbQ7MF3h2Xsrs1DL1LPkcCamCVbvVvMxHdLaoix9D0RdzLatq1mFrYKjLf/epOgz8m iTLB7CFphChpE5tcWLSP4SFclBPud6/9lqrKCU9/7UtrwZa1QPwVN/hw4X1OZD5Vg2wj3u ozxtu4l6y0kfHfWnNiLU+Yu3kkhPA+QMrwgp0K6T3ue8amnrhtlUQO2p0H4OBq9+0YPkCB /73yb8uAFAhJHJwBgWer1I5lM7kA3Zx7sCcPB+dpLYMi7UTHAX/5XGRjTNTILw== 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=1771010768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7S/kH9gnPQURuyJ3s7gMgbSp309M3g33fU6MfJHAxrg=; b=FrkAn5rp8uSSIiPSh2K+syOzXh96sW7IfnkdR2OOU72HgJZlpNDKyakkRFg4wAzcCoLQD9 6OxzqhyqaP7fPQiypZeTkC8e8o+7ZfFSrtx8jCAvgP5zWMAFOnovwAt+k2gJNDTrdCigdG kvzg0+HeyOfcUsMqKabyCeNq7clxLv6gabml/ntun1uuondfn/ebWrMVGubDT01e6vFLv9 iY4PXztCl4K1dkclHSFyTEpQNQYOo5fbSPOyouXR+gwZcw0mUCsKhorjVzleosKiI51uX3 1SPBlChD140BADN5n83yf2vbwoGi1hKpxGmKug6iDyJ2tC/5b9eOkjlt3sjOXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCMbN1l5MzbCL for ; Fri, 13 Feb 2026 19:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dff4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 19:26:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 284a0aa96eb6 - main - diff3: add 3 missing files from the testsuite List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 284a0aa96eb63f12831a9e06514a50b2cd80957f Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 19:26:08 +0000 Message-Id: <698f7ad0.3dff4.496faaf6@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=284a0aa96eb63f12831a9e06514a50b2cd80957f commit 284a0aa96eb63f12831a9e06514a50b2cd80957f Author: Baptiste Daroussin AuthorDate: 2026-02-13 17:45:39 +0000 Commit: Baptiste Daroussin 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