diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2008-06-11 18:54:06 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2008-06-11 18:54:06 +0000 |
| commit | b4b04f194fd2d2926b6cd55795d1d73a81526ff1 (patch) | |
| tree | 9d131a5ba976f98085d7d810500ccbddf57bae0e /usr.sbin/mergemaster/mergemaster.8 | |
| parent | aa15c94529d51680d605585bdb1f216865b94e56 (diff) | |
| download | src-test2-b4b04f194fd2d2926b6cd55795d1d73a81526ff1.tar.gz src-test2-b4b04f194fd2d2926b6cd55795d1d73a81526ff1.zip | |
Notes
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.8')
| -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 63cf2ab1ee88..1d7b2608f5a4 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 # |