Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Apr 2024 17:44:54 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: c384235c1633 - main - mergemaster: Fix typo
Message-ID:  <202404111744.43BHis8o086983@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

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

commit c384235c16330cb48c3b0b02ff821ff0915bd2a4
Author:     Elyes Haouas <ehaouas@noos.fr>
AuthorDate: 2024-04-11 17:40:05 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-04-11 17:40:47 +0000

    mergemaster: Fix typo
    
    Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/882
---
 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 d362af6a2b4f..572415164101 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -1246,7 +1246,7 @@ handle_symbolic_link () {
   esac
 }
 
-# Compare symblic links
+# Compare symbolic links
 for COMPSYMLINK in `find . -type l | sort`; do
   if [ ! -L "${DESTDIR}${COMPSYMLINK#.}" ]; then
     if [ -n "${AUTO_RUN}" -a -z "${AUTO_INSTALL}" ]; then



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404111744.43BHis8o086983>