git: 888410c948d4 - stable/13 - mergemaster(8): Fix a typo in an error message
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 29 Jan 2022 08:44:58 UTC
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 <gbe@FreeBSD.org> AuthorDate: 2022-01-26 16:59:49 +0000 Commit: Gordon Bergling <gbe@FreeBSD.org> 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 ''