svn commit: r202340 - head/usr.sbin/mergemaster
Doug Barton
dougb at FreeBSD.org
Fri Jan 15 04:09:22 UTC 2010
Author: dougb
Date: Fri Jan 15 04:09:22 2010
New Revision: 202340
URL: http://svn.freebsd.org/changeset/base/202340
Log:
Oops, deleted one line too many. Add back the null case for IGNORE_MOTD
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh Fri Jan 15 03:56:48 2010 (r202339)
+++ head/usr.sbin/mergemaster/mergemaster.sh Fri Jan 15 04:09:22 2010 (r202340)
@@ -652,6 +652,7 @@ case "${RERUN}" in
esac
case "${IGNORE_MOTD}" in
+ '') ;;
*)
echo ''
echo "*** You have the IGNORE_MOTD option set in your mergemaster rc file."
More information about the svn-src-all
mailing list