diff options
Diffstat (limited to 'usr.sbin/mergemaster')
-rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 63cf2ab..1d7b260 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -312,6 +312,9 @@ with all values commented out: # Automatically install files that do not exist on the system already #AUTO_INSTALL= # +# Automatically upgrade files that have not been user modified +#AUTO_UPGRADE= +# # Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf #COMP_CONFS=yes # |