From caec8ca31895494e3aa869e4a120eb00f6fda2ea Mon Sep 17 00:00:00 2001 From: dougb Date: Wed, 11 Jun 2008 18:54:06 +0000 Subject: Document the AUTO_UPGRADE (-U) knob for .mergemasterrc Submitted by: mezz No Cookie For: gordon :) --- usr.sbin/mergemaster/mergemaster.8 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'usr.sbin/mergemaster/mergemaster.8') 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 # -- cgit v1.1