Date: Wed, 30 Dec 2009 23:26:29 +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: <200912302326.nBUNQeWl057515@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2009-12-30 23:26:29 UTC
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.8
Log:
SVN rev 201293 on 2009-12-30 23:26:29Z by dougb
It's not necessary to include both Op and Fl for command line options
included in the text, so use only the latter.
Clarify that using -U doesn't make sense in combination with -a
Revision Changes Path
1.43 +11 -9 src/usr.sbin/mergemaster/mergemaster.8
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912302326.nBUNQeWl057515>