From nobody Wed Jan 26 17:01:02 2022 X-Original-To: dev-commits-src-main@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 EF8BF197A5EC; Wed, 26 Jan 2022 17:01:02 +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 4JkVNZ55fFz4ZYN; Wed, 26 Jan 2022 17:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643216462; 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=yv/L2KbPI4Ce85YqeWjHtZ4BatEcBdhnuAJZiWJBdKo=; b=XiQ9uQsd3VUOJPjCSQRkmEMlUlzRbb//4rwpc6DZRIqWzolBoPFO8iIe8FnI1hdDbYM5d/ NRHdVLzw2K+uJ5LIcHJ3r8qIHv5leuYLV6dkshrR4A31gD0dzMSHEf2QmDvvK2JKjEhcmV +hkZUZrQCOBbzKZVuaRfE2Vkkl2vb11D9NLxTRMN0I+06gFylSy+5u1uaocuecIK2A7CLO UwCi2J0OagwTt17taPcna7sRW7s4HaptfkSBQcCdsiKdZvwE9Z7Q5ytZSmlTU9BHGwxbbM Wgz2HjkpGsKdUCskU0FQ5PXOwQ9HCH09zF/Yitzf2NEwb8KoOJhm12isRYoeHA== 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 902C1262FD; Wed, 26 Jan 2022 17:01:02 +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 20QH12h8020779; Wed, 26 Jan 2022 17:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QH12rJ020778; Wed, 26 Jan 2022 17:01:02 GMT (envelope-from git) Date: Wed, 26 Jan 2022 17:01:02 GMT Message-Id: <202201261701.20QH12rJ020778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 575c1773bf2c - main - mergemaster(8): Fix a typo in an error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 575c1773bf2c44c9bf5aae3cc556886d75d6e276 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643216462; 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=yv/L2KbPI4Ce85YqeWjHtZ4BatEcBdhnuAJZiWJBdKo=; b=bZ+cnLya8cDtzhPFYfBoUtqzVgw1M5ZzQZ/VGeZXaMWPAJVJlRpRkGHUeQ5EELICRJFKn+ +SYJ+WymnMX61gdXkLydgZL3U7KMHS6uHHBOSuxLtN8IQT2UPB8nfsfc8br3fFLxch/dG+ nmHvVtgBXUYwAj5vZF4Y6kR4QPu0Uq9Az0lrDTei1bhzixzooyRvMDdKS3vxTLesuQN8Om VfJCMoBJmiapaT5Nn2YqRwuKMGtS2KQpUTHAbBVGrh1Vv5g5AxtMRhja1daypchubRErNE uZiiE9Sf9oAiQef+o/OEOZtrKyuT14Xp3h2tKe0OrOjGgVOrE8GdpH6DAyjwBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643216462; a=rsa-sha256; cv=none; b=L6r3sC54KBllif4HX4wbCPPOR7AxiID6ZnB1e/Gj2vD0AVEhukubedmPoNGEoRAhWHFke7 M+L26R1F8lce+6kalxpBqNjyy3W+igVuMrODARx6Nhup8WyGLAmQFWNQFIEE9tAWJesEcG zicHPHE8ohLKuwYGmfcsYLfZBsx8ZjWKrrNbiQwH/AT8ajL4fzb7152yjd4c5hev0QveTs 8uo3gLUizb499V0tHQQcfMycUQfIUp0nVDhlkJQcpVGPu0DeyhvzhXtK6pCuz3VivOpdqh 24/QDwskApPc5cj6ILgtF6/ZIzGZ/CDmazNP5yC78SABP04g/+dLOrJf68PBXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=575c1773bf2c44c9bf5aae3cc556886d75d6e276 commit 575c1773bf2c44c9bf5aae3cc556886d75d6e276 Author: Gordon Bergling AuthorDate: 2022-01-26 16:59:49 +0000 Commit: Gordon Bergling CommitDate: 2022-01-26 16:59:49 +0000 mergemaster(8): Fix a typo in an error message - s/differnt/different/ MFC after: 3 days --- 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 5b7a656c1cd9..edbf07d743ee 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 ''