diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-03-07 04:13:22 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-03-07 04:13:22 +0000 |
| commit | ed8251f88870501e5da9a17de533fad0f73c92ea (patch) | |
| tree | 7f0be274a19dabea3505f8f9241f6a162240d3e3 /usr.sbin/mergemaster | |
| parent | 0d0fae3406d8f943561e63e305a913e18caac6e2 (diff) | |
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index d88bdd012110..e561a727af04 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 29, 2015 +.Dd March 6, 2017 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -226,9 +226,10 @@ destination directory. .It Fl p Pre-buildworld mode. Compares only files known to be essential to the success of -{build|install}world, -including -.Pa /etc/make.conf . +{build|install}world, i.e., +.Pa /etc/group +and +.Pa /etc/master.passwd . .It Fl F If the files differ only by VCS Id ($FreeBSD) install the new file. |