From nobody Thu Apr 04 12:07:30 2024 X-Original-To: dev-commits-src-branches@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 4V9L363sbTz5GtMH; Thu, 4 Apr 2024 12:07:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9L362xqxz42BT; Thu, 4 Apr 2024 12:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712232450; 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=hHc5suySQvs/JQ7uTen5WQVxpOHaV9kl9nfqzRMAYB0=; b=LzBFBkleaUSJv34784So8w1CuK9NUhDyeAaBdrxUnsc6zRZf2DDU8LlqJCnxZg2dWG4oMC dzj+zOp6oln4bSsmVE5PaclI0n88WTGbqmcfdVnTI57ecRNz2cFotu4uMOgjN8A9k59a+o zPIdEmii1XJL/MAxGA0r34MhrKICrkXZkh1n7EKIbuDs9tQDTwpynRAfFn1vgONqTgswXP rpP3AVdxHRC2gsm7TYMBle8kHdj7qWbXgYPLUtEjetI+WlKsqG3MCInbHIj0b1trQ9uQpX eAAC/PMj6JUYNWzqg5GewKxhjdxwPi2NcuM5CDJLtLCuHrQYgm+P7VV2H4DZVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712232450; a=rsa-sha256; cv=none; b=W2d0Ib2bAp6jVsWzHNx88nDRCPfYK7sSgaNlCSajmM6eM0LxdgiidPPPax7yc4ELeiqnck yFR0SA+cbm1iui1JrmLaN1LwcbRVHGhfnpdc5QgM5OHuavvSrveJQPdi4Oy2Ozz4deXWcx ElIld3x+DECg1A6opJrb2GqqkX0iypUatoUNEqBNO9En4m2EsIaqXWXYzugJvgnNog9PsT zPiO/TWTnvPqX9T1JCs41VdFVcQDKPk6vhQ/KvWAryx9eC/VonZfXwXtfgFCg+gZR8sczv xCC0P6CHU6d4l3kHFsP9gPsrKvNfe+HKUVXnvpSpSoGQNge3wlSqv3T9NWbsJw== 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=1712232450; 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=hHc5suySQvs/JQ7uTen5WQVxpOHaV9kl9nfqzRMAYB0=; b=CeW41dsU8MQQ7Jn1Otu/gEUm+45cB6WOoRtgjA94qgIX1UVi1VOK3A8BbrwUuGl8xsxzxc R2u9uNi7DlM9dn9ZeQYtZS47Eswf/+BS3qh8SWugF/gXWHI66O4g7bNp8sgUXvtT5jySk3 97AYAzdlIhzUTW9K3YonOhCcoc3UjDQd6iMz/sEUApebzfOuaivbkS/u2WHxWByBBhXNxf vcFAFzwwCGsw8vLxBlMpIxyeQphFYb4U4e1ocnMTQ9Nineyq1M3PNv4N7GYco+BiKTsnvf LozbVmH5oDdyMWG4RR3dfaoGXQrey23FQvh1crTWzwXhj5bw5rtI/l61UQ44fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9L362R2szFwT; Thu, 4 Apr 2024 12:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434C7UU7011426; Thu, 4 Apr 2024 12:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434C7UIb011423; Thu, 4 Apr 2024 12:07:30 GMT (envelope-from git) Date: Thu, 4 Apr 2024 12:07:30 GMT Message-Id: <202404041207.434C7UIb011423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b9e32d8c8f51 - stable/13 - Clean up botched merge. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: b9e32d8c8f51f053988e45b61d90f3bc9cb77fb0 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b9e32d8c8f51f053988e45b61d90f3bc9cb77fb0 commit b9e32d8c8f51f053988e45b61d90f3bc9cb77fb0 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-04 12:07:00 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 12:07:00 +0000 Clean up botched merge. Fixes: 6895133fe293902f19a060c0cf229ea9b23bb555 --- etc/mtree/BSD.tests.dist | 5 ----- 1 file changed, 5 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 82c77c6d43c7..98450e1cafbd 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1105,13 +1105,8 @@ .. tar .. -<<<<<<< HEAD -======= - tftp - .. touch .. ->>>>>>> 74a4aa9b1517 (touch: Add unit tests.) tr .. truncate