aboutsummaryrefslogtreecommitdiff
path: root/ObsoleteFiles.inc
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2023-09-09 13:17:16 +0000
committerEd Maste <emaste@FreeBSD.org>2024-07-16 12:25:54 +0000
commitf2055611fe5624017bd7769c8dc6419c348806ff (patch)
treeead587624b1047979414caedef4df2ae2c0d2252 /ObsoleteFiles.inc
parentdb3a524c8a965d3adcf03fe08b28b37f63e1126b (diff)
Diffstat (limited to 'ObsoleteFiles.inc')
-rw-r--r--ObsoleteFiles.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 19eefda42fe9..f8f0309d6ccf 100644
--- 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