Date: Wed, 13 Apr 2011 19:55:59 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r220609 - stable/7 Message-ID: <201104131955.p3DJtxSg009886@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Wed Apr 13 19:55:58 2011 New Revision: 220609 URL: http://svn.freebsd.org/changeset/base/220609 Log: MFC r220512: Update recommendation for mergemaster. The -a and -i options are exclusive. Modified: stable/7/Makefile (contents, props changed) Modified: stable/7/Makefile ============================================================================== --- stable/7/Makefile Wed Apr 13 19:54:54 2011 (r220608) +++ stable/7/Makefile Wed Apr 13 19:55:58 2011 (r220609) @@ -57,7 +57,7 @@ # 6. `mergemaster -p' # 7. `make installworld' # 8. `make delete-old' -# 9. `mergemaster' (you may wish to use -U or -ai). +# 9. `mergemaster' (you may wish to use -i, along with -U or -F). # 10. `reboot' # 11. `make delete-old-libs' (in case no 3rd party program uses them anymore) #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104131955.p3DJtxSg009886>