From nobody Sat Jan 29 08:45:57 2022 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 BBFB2198C0BA; Sat, 29 Jan 2022 08:45:58 +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 4Jm7Fx6BcCz4k2P; Sat, 29 Jan 2022 08:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643445957; 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=B0f5dGOjetkHzKflGutDahDOyloAClPL8U7F/AWpJwE=; b=AMhQG/OcYhLPsC9mQ0/o4y7+WRpHWUNo7SZA3xzI2rJ1jr3uBYlV01b4jQTprOna6PxPjz R8m1AMkf6vwgm9U2iALFqywl3qy1HEneUrwfG69aKqZxRiAEiTX7Ufj1eRzYsmwc+ZujuG xJFacPnHZ/yegFxfcLra7BxOnuo/cSSdA421gdxPBSCtDSMXyp5R+JZTg99T82wFETgPjf DJC+c/M1HmgO0pbp0LwlIJk8U72sXqWM/cFlnHqyxNWMY4vSHxWsTznV+0v9MKb2znChzv YPjvaaI9vvusBBapbIzElfRNM/tKZYvDFZMbdiyhSCnmNtmHOWi5hMkn3caszQ== 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 B512212D97; Sat, 29 Jan 2022 08:45:57 +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 20T8jvLA043880; Sat, 29 Jan 2022 08:45:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20T8jvnT043879; Sat, 29 Jan 2022 08:45:57 GMT (envelope-from git) Date: Sat, 29 Jan 2022 08:45:57 GMT Message-Id: <202201290845.20T8jvnT043879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2574fdd82190 - stable/12 - mergemaster(8): Fix a typo in an error message 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2574fdd82190399eafadb5eafc43d20a9be2bdec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643445957; 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=B0f5dGOjetkHzKflGutDahDOyloAClPL8U7F/AWpJwE=; b=vDGYjSfUBTohEXdB9yV8VbBOanWlM9RHVPv6kHwkQ65qPk7DxegdLNvBdiinBXVBs3GnDJ A/z9lNmNUH0PO6yV8WDiAglUqiAT4PvqHnzyyqy+HIgmI/wQ4zaM4doNukiH4uUKPNcv7Q ksA58UGX1Yc7qfFcptdAy3oQ9VumCcBaIUKfj+8DPeU+GeXTq8nwmDL1qN3/heoax/X/tv qShasIY9MoBPShWJauOkhfz8QHKSBSJn1rEzBfSfqlUjJDq8fVZIGRK8SIJcgNAetN0xIc el7jEeMD8t8fEzI+PniYP/vmFrZ5wMkzcs7noWAPiLpmUxBwdKSAad+7RlzOLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643445957; a=rsa-sha256; cv=none; b=T+wy6oUY+yP+vw18zL30BzKh0Y50zBMBnGbKYza3EHsxCsCdCRMe+mMJwdYEcmt+ocIxe+ CSDRZnTYICZSLD1ABxtLlnW40IyCEpL1ZJNzMtJECI7BnRa/OICzsx+yQx0EEZ0vhx/DOD SnuUAHDWmxKEpGb6xYJwvPD+kFGGlnzdkGtAUCI2jUZSuH4EoZhXj/6r8chS42bFE/nSWC q+Ki4r/5v6EjW+fvAyLC4nXJIrhCkWeUmyrEBzpOuNf9xGRnE0mU1hV0Rht5wTi6dML69d 5lRCpm18rbwUHVWcHgVEQ5QcTbwJzVG00nySu4BvglHJo3UNrVWsmYZqNV3IVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=2574fdd82190399eafadb5eafc43d20a9be2bdec commit 2574fdd82190399eafadb5eafc43d20a9be2bdec Author: Gordon Bergling AuthorDate: 2022-01-26 16:59:49 +0000 Commit: Gordon Bergling CommitDate: 2022-01-29 08:45:46 +0000 mergemaster(8): Fix a typo in an error message - s/differnt/different/ (cherry picked from commit 575c1773bf2c44c9bf5aae3cc556886d75d6e276) --- usr.sbin/mergemaster/mergemaster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 7703e2856111..4a19dda8ff9d 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -1278,7 +1278,7 @@ for COMPSYMLINK in `find . -type l | sort`; do continue else echo '' - echo " *** Target of temp symbolic link is differnt from that of installed one" + echo " *** Target of temp symbolic link is different from that of installed one" echo " Temp (${COMPSYMLINK}): $(readlink ${COMPSYMLINK})" echo " Installed (${DESTDIR}${COMPSYMLINK#.})): $(readlink ${DESTDIR}${COMPSYMLINK#.})" echo ''