From nobody Thu Nov 19 10:54:11 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 4jVb1v4Kmtz72NHc for ; Thu, 19 Nov 2026 10:54:11 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVb1v1ybcz3GCv for ; Thu, 19 Nov 2026 10:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795085651; 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=5FoAKmyH4+mmcoP2dh2uJBuyW9kkOdAt6qN0TtQstQE=; b=ua37b25R0sBAbXRIDlsBkOLhBeWEB304heJo6cWyX92FHBFwaSln7QrLXZ5b83DyilrdDF d2ojQRg8yQLyrnFkE3MdJOx+BQi87iU1+gwIOPBd1cDjQKiosHSo+bGppoezMeb8o/5oiE ftNLK/k7AsCy0SjYPHnGHtCYCvLz1Rvnc2UZ5mJH9VXoXvnDoTZxQGiY2lOqaOmvcwhaVz 8tcCYK6kwik6wNISRHH6y+BHXl2IhXtB86epfsmRjGQV4wnltadr9E9Tzp8592CjYcN5FI eIVoEuBs+DH6XRCGVS2Bxq8gAMwsooYdpDP0b1eeXwyqNnmtGa9x5F+wWuH9+Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795085651; b=DlTeyIE243LU+Mfpw5Dh4A8/JNueDH/6HsdW0x5H4OgGp8Ht/inBHZDPGtNKAl1zIhlGKj lBlmBks45ccHrHODzt3+Lg3IUdCKCO4aJ13bqaCZhA3dbtDw5NzoeMCbMvnE8fn/BVmVQ/ sVQroBdS1509sUl0+hxODgf4LXgs7RwjKekfE8t1vtzickmLkMCcG/dtdz8f1S+K/6sXzf +e/K5JQfQKtpV1uAryjeasqp7FsWwNJXQv91KkQ6XAbZz2fZqux3sYqGBPAPXEr9tsQAFA YOPMQzeQwgvbxWR8WKZD6y1+d7ZIA0Vcpm5GyDTH0EqJlEhyow0FPtFZidfKIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795085651; 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=5FoAKmyH4+mmcoP2dh2uJBuyW9kkOdAt6qN0TtQstQE=; b=RhivWGFixU3dN0HULsa9VhLUlEb4aIqRieVdtTk1cVrLC+yBMwb7fGJ3Jsuj5XStC4BKOD WoE0h9JD4vCDRImxImYITxS/LWp3uf8cv0JCbDOJrCCyUdTa9ny+d0RF27tY4LA89Kxbzb w7vYOALJ+XgiV7k1UMyBPzC5b1HzxHRVdgLOyY9Oom1Vx5Sc09Y5cxGKyO+YfuVnTzvb73 MWuMWPXqLbtVVT/cTOcK3/el623vIzA7ES7+SIda/8sM+ainqU1uJUGzIDss33PoOced56 jKPrcj1FKbDOPUzaBjU7F5xTRMdBKa1QJxftcOloMATAK6+ljlWPV7UBI7fWfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jVb1v1cwZzxtR for ; Thu, 19 Nov 2026 10:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fc8e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 10:54:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: e4240eb83b2f - main - diff3.1: fix end of block that is not open: El List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4240eb83b2f974ecf103cbbdbde333d0b75c8d5 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 10:54:11 +0000 Message-Id: <6afed553.fc8e.6b294116@gitrepo.freebsd.org> The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=e4240eb83b2f974ecf103cbbdbde333d0b75c8d5 commit e4240eb83b2f974ecf103cbbdbde333d0b75c8d5 Author: Wolfram Schneider AuthorDate: 2026-11-19 10:53:05 +0000 Commit: Wolfram Schneider CommitDate: 2026-11-19 10:53:05 +0000 diff3.1: fix end of block that is not open: El Approved by: des Differential Revision: https://reviews.freebsd.org/D61746 --- usr.bin/diff3/diff3.1 | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.bin/diff3/diff3.1 b/usr.bin/diff3/diff3.1 index 8ca2d9f853af..fa593e9a8ed8 100644 --- a/usr.bin/diff3/diff3.1 +++ b/usr.bin/diff3/diff3.1 @@ -210,7 +210,6 @@ or .Fl X flags were specified, it exits with a status of 1 if conflicts were found. -.El .Sh SEE ALSO .Xr diff 1 , .Xr ed 1 ,