From nobody Thu Jun 23 12:38:49 2022 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 805EB86772E; Thu, 23 Jun 2022 12:38:49 +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 4LTKYj38j8z4RyH; Thu, 23 Jun 2022 12:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655987929; 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=BuPWsAhrloht818iZ7rvQtxY4ca5YAbqnLm0MlPL+Fc=; b=B+Rh947qGDz7pcWCNwnLhLCSz9YkJ2g0OuSL6XMxZhGT/L+BWe6sG25oaH2qWbRTY8v7S0 pOTd9TdQfaCNVmjX5Ac1UcL194QyEMG4lNmPCut9U9UXM5lopcx75nGR3gadqV5cVn3BHX Qxd9mYn4VLX8eOUS/IEj6XvKR4fhDAtkQYAv03yqnRaoJNOefXRETF2KRqYf9st3uzLXJs IevFQXd5odS8osGL6E95pClZzJoqStZ1mGh4Lv+dUYyUgQThTl4AozmblIwBNzh0haJ9KD t9e98q3GyU4TvPPUNX/soDF1kt7XJPHNQEuoRSStc8s0HpoPH6nSpamGMzEJoQ== 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 4C1C41AFC3; Thu, 23 Jun 2022 12:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25NCcneX049852; Thu, 23 Jun 2022 12:38:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NCcnsO049851; Thu, 23 Jun 2022 12:38:49 GMT (envelope-from git) Date: Thu, 23 Jun 2022 12:38:49 GMT Message-Id: <202206231238.25NCcnsO049851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 26b5deef22ae - main - diff3: Add man page description for version and help 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26b5deef22ae316646b6bd173414826a9598b666 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655987929; 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=BuPWsAhrloht818iZ7rvQtxY4ca5YAbqnLm0MlPL+Fc=; b=v0xjHo6v+HI7yPH+I8uT5cczsotKO6slT5b8/znRMvbSjhFoKRcqfjAayOgEJavfcrfH4u zH2hxWagzZo2k7TK713pByOAIl62iCArbvRuwprOynw6lIGvibiOvY0qNMWBQ1PJ/uyJvV 9btDHaln6peYTnF64GmTM7wKn5VdnxsoKuiaoiG1HiZX52jZojrAlYm1W8t5irm5gDsa90 JyhRXrEqPWM8NgBNYg1AascAvPRf6ZQXy6Np2q22Cdma70vbYQt+9Zsnete3aV+VBGLJnE EqPUCgkrfk/iGT4rlQsC3QbizhGjJOE8tcemaADl7tdKa3oWv0L4RWfOI94DXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655987929; a=rsa-sha256; cv=none; b=Bo3qsqjNWHq2J8pudDI8bCtNd2w5DRbYcZ4Qyq886CsWtAqy/TBXrPXxmXgRNQmkfyXYJQ 2dNNKCWVIbtRIZr+wcI8cZwXLT523y+jM5obNdcuNZcsFThzR4ivRfqNX2ivM1V4t7G+C+ 7eLqKdrjgu19ZFLzZqNdSYweGW7ZzTEhMNNfzEtCca4+eWai+TZgeuk2R9y4/QamAzjfvQ VNbQIklDBCLWyYxggFMEPrB2yiurUb5o3GkFhVgwdAIkVKF9+Zd2IFI/VBHNMV1g++6/cM PnmZpgds+2okR5NK/bT9842ai3VswtffBeliPTUi26qk7Skm62jnwhHPNHNb+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=26b5deef22ae316646b6bd173414826a9598b666 commit 26b5deef22ae316646b6bd173414826a9598b666 Author: Tom Jones AuthorDate: 2022-06-23 12:37:28 +0000 Commit: Tom Jones CommitDate: 2022-06-23 12:37:28 +0000 diff3: Add man page description for version and help Reviewed by: Pau Amma Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D35325 --- usr.bin/diff3/diff3.1 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/usr.bin/diff3/diff3.1 b/usr.bin/diff3/diff3.1 index 6968af44bfbd..fcd9bb413089 100644 --- a/usr.bin/diff3/diff3.1 +++ b/usr.bin/diff3/diff3.1 @@ -30,14 +30,14 @@ .\" @(#)diff3.1 8.2 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd April 19, 2022 +.Dd June 23, 2022 .Dt DIFF3 1 .Os .Sh NAME .Nm diff3 .Nd 3-way differential file comparison .Sh SYNOPSIS -.Nm diff3 +.Nm .Op Fl 3AaEeimTXx .Op Fl Fl diff-program Ar program .Op Fl Fl strip-trailing-cr @@ -45,6 +45,9 @@ .Op Fl L | Fl Fl label Ar label2 .Op Fl L | Fl Fl label Ar label3 .Ar file1 file2 file3 +.Nm +.Op Fl Fl help +.Op Fl Fl version .Sh DESCRIPTION The .Nm @@ -107,6 +110,8 @@ and It is useful for backing out changes specific to .Ar file2 only. +.It Fl Fl help +Prints usage information and exits. .It Fl i Appends 'w' and 'q' .Xr ed 1 @@ -139,6 +144,8 @@ instead of the default to compare files. .It Fl Fl strip-trailing-cr Strip trailing carriage return on input files. +.It Fl Fl version +Prints version information and exits. .El .Pp The