Date: Wed, 18 Mar 2009 21:55:08 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 Message-ID: <200903182155.n2ILtLjg030369@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2009-03-18 21:55:08 UTC
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.8
Log:
SVN rev 189994 on 2009-03-18 21:55:08Z by dougb
1. Update for new -F option from r189992.
2. Sort the command line options to match how they are displayed
in usage()
3. Change references to cvs to the more generic "version control system"
and remove the .Xr for cvs
4. Consistently use ".Op Fl" to refer to command line options in the text.
5. Only use the apostrophe to indicate possession.
6. Add FREEBSD_ID (-F) to the list of variables in the example rc,
and change the DIFF_OPTIONS example to -Bb since -F now covers it.
Revision Changes Path
1.40 +42 -22 src/usr.sbin/mergemaster/mergemaster.8
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903182155.n2ILtLjg030369>