Date: Sun, 14 Mar 2010 05:22:46 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh Message-ID: <201003140523.o2E5N4tH080729@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2010-03-14 05:22:46 UTC
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.8 mergemaster.sh
Log:
SVN rev 205145 on 2010-03-14 05:22:46Z by dougb
Make it more clear in the docs that -a is not compatible with -iFU,
and enforce this in the code. Apparently a lot of users mistakenly
combine -a with these flags and are then mystified that no changes
were made.
While I'm here, fix a trailing space in mergemaster.8
Revision Changes Path
1.46 +9 -6 src/usr.sbin/mergemaster/mergemaster.8
1.84 +13 -1 src/usr.sbin/mergemaster/mergemaster.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003140523.o2E5N4tH080729>