git: 575c1773bf2c - main - mergemaster(8): Fix a typo in an error message

From: Gordon Bergling <gbe_at_FreeBSD.org>
Date: Wed, 26 Jan 2022 17:01:02 UTC
The branch main has been updated by gbe (doc committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=575c1773bf2c44c9bf5aae3cc556886d75d6e276

commit 575c1773bf2c44c9bf5aae3cc556886d75d6e276
Author:     Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2022-01-26 16:59:49 +0000
Commit:     Gordon Bergling <gbe@FreeBSD.org>
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 ''