From nobody Sat Jan 29 08:44:58 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 A45ED198B72F; Sat, 29 Jan 2022 08:44: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 4Jm7Dp3V6Zz4jLV; Sat, 29 Jan 2022 08:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643445898; 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=w085MsVZHlk4EGUC5hCdIpIy42jp8PnjPkCdl2DqbPc=; b=IbdM+KoeeE3LP74cPMKon+BdDmhNsxbFfWslsJ7YuJ3lCGAkPWKhdHHxSxWWwgST04MRDY aOYO8eJjxHoz47eijW6nOx+Pt8R0LUArFrIneAx4sK3JDEz7py26Joc2634usV8I1DsgG+ EENXha3ZQHJwcqP3/RhHbSsK2jT4IHyjMhJ/lQw/Y0fgiGO+efP9fRVFzkdS6C+H+anOss Ll4g7sZGIbpOpf1O8Tix/eTB7mX0jotghWoc7dBeebztBYl3CLshkb5xSilHyfuNDPtLCP f+rVZfdoOaUABxuzLlXjGutVgy40SBvREwB2h3fXGuKk9d4gaxyq9VdFq5xiVg== 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 54C6E12F8F; Sat, 29 Jan 2022 08:44:58 +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 20T8iwNG043635; Sat, 29 Jan 2022 08:44:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20T8iwer043634; Sat, 29 Jan 2022 08:44:58 GMT (envelope-from git) Date: Sat, 29 Jan 2022 08:44:58 GMT Message-Id: <202201290844.20T8iwer043634@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: 888410c948d4 - stable/13 - mergemaster(8): Fix a typo in an error message 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 888410c948d436191d04feee57a048c9d0f14fe0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643445898; 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=w085MsVZHlk4EGUC5hCdIpIy42jp8PnjPkCdl2DqbPc=; b=Wlyuef45pfcaGVIM/rMShz1ssWSqKrSqvQMBq4xluTQMLtdfgX7LS06K13cce/u+amuT74 WZfqMCxA2sj/ZCg9kvnmHmgrb03qBAMgkr3ChK8Y6y4kEkQ2DPXGzOiTJ+TxZLYdDL08QA g45B8M/1q/YBv7cjo5zPi6fTOV/5ovHWtNYQ4GmaLdyZ/8e4RgHG9ZbHV7Lh003axdpguu /qhGhl90Gg/Sz1M33FdARj7JrRnLsW6mJ0aw6N63B68sn9AXqzO5CRc51xoShZVs2/Izyd wg9Yji7dUgFaze8WDETOk239uGzp6JHgBppsqTZvvCr7S4WIoNp6nmtw11tbtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643445898; a=rsa-sha256; cv=none; b=EuwNAZ7wHwftZ3KjmJNVV5+e6nR1j70FFYD3GKsQ/WIFW6SG3OVs5nRlPmnJC9TCDoPwQy kbTvWX+LvFHmdBT72kJRma5IUX5+jdktJms+oZ4prwHA2Vl7YXxC+P481v0+F1P/+VMXiw lJiY6e1BQH34i6KiVOWA5+t9YCRBCFc1m1h2xaVOQAP7aCOwusV8EXA8qWH+dgk4bmYkql LaUnJSEiRxAhXBWhGrDDbUBV9Om0DMY58Fjqbqio/4ECvdYzgpZ2zvnETMGxGzIFr3zQwf xHLWKsmOMJHVCpv49fsuw0XvyhQXwdhXMMbUFTlDNHNjiKhluycwwGKBuZd7/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=888410c948d436191d04feee57a048c9d0f14fe0 commit 888410c948d436191d04feee57a048c9d0f14fe0 Author: Gordon Bergling AuthorDate: 2022-01-26 16:59:49 +0000 Commit: Gordon Bergling CommitDate: 2022-01-29 08:44:30 +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 ''