Date: Thu, 1 May 2003 23:28:30 -0700 (PDT) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 Message-ID: <200305020628.h426SUw3044694@repoman.freebsd.org>
index | next in thread | raw e-mail
dougb 2003/05/01 23:28:30 PDT
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.8
Log:
* Document the -P option
* Add a paragraph suggesting that the merge option be used only for
files that users have modified. People have been using this option
for all files that are different, causing unecessary confusion.
Revision Changes Path
1.28 +17 -1 src/usr.sbin/mergemaster/mergemaster.8
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305020628.h426SUw3044694>