The branch stable/13 has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=76a0f6f3bfd8a77146d328c89b424565d4036761
commit 76a0f6f3bfd8a77146d328c89b424565d4036761
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2021-04-20 20:22:24 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2021-06-09 21:19:38 +0000
etcupdate: Trim trailing whitespace.
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D29845
(cherry picked from commit ada7fd17d57fac3dbafff5a1b3268afb872c8b0b)
---
usr.sbin/etcupdate/etcupdate.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index 3fd2e87bf52a..dc26bc0c8aab 100755
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -442,7 +442,7 @@ empty_destdir()
#
# $1 - first tree
# $2 - second tree
-# $3 - node name
+# $3 - node name
# $4 - label for first tree
# $5 - label for second tree
diffnode()
@@ -867,7 +867,7 @@ merge_file()
# $1 - pathname of the file to resolve (relative to DESTDIR)
has_conflicts()
{
-
+
egrep -q '^(<{7}|\|{7}|={7}|>{7}) ' $CONFLICTS/$1
}
@@ -1526,7 +1526,7 @@ EOF
if [ -n "$preworld" ]; then
> $WORKDIR/removed.files
fi
-
+
# The order for the following sections is important. In the
# odd case that a directory is converted into a file, the
# existing subfiles need to be removed if possible before the
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
