Date: Fri, 15 Jan 2010 04:09:22 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r202340 - head/usr.sbin/mergemaster Message-ID: <201001150409.o0F49MUY041948@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001150409.o0F49MUY041948>