The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=afd67a1677999b0f9d82d29bfd7c767f665e76e8
commit afd67a1677999b0f9d82d29bfd7c767f665e76e8
Author: Ed Maste
AuthorDate: 2024-07-16 01:44:11 +
Commit: Ed Maste
CommitDate: 2024-07-16 19:17:31 +000
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,10 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20240716: retire mergemaster
+OLD_FILES+=usr/sbin/mergemaster
+OLD_FILES+=usr/share/man/man8/mergemaster.8.gz
+
# 20240527: csh: Remove hardlink /.cshrc
OLD_FILES+=.cshrc
diff --git a
Am 2024-07-15 22:13, schrieb John Baldwin:
bugs might have been useful in the log as well. I think it's fine if
we want
to have some checks that are always on, but it's currently quite rare
so
needs a bit more rationale in the log than other changes is all.
Is this a "we want to keep this p
