Date: Wed, 17 Mar 2010 07:26:59 +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: <201003170727.o2H7RN5t074302@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2010-03-17 07:26:59 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_7)
usr.sbin/mergemaster mergemaster.8 mergemaster.sh
Log:
SVN rev 205246 on 2010-03-17 07:26:59Z by dougb
MFC r205145:
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.36.2.5 +9 -6 src/usr.sbin/mergemaster/mergemaster.8
1.54.2.9 +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?201003170727.o2H7RN5t074302>