From owner-svn-src-all@FreeBSD.ORG  Fri Jan 15 04:09:22 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8CA6106566C;
	Fri, 15 Jan 2010 04:09:22 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B7C7C8FC13;
	Fri, 15 Jan 2010 04:09:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0F49MxR041950;
	Fri, 15 Jan 2010 04:09:22 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0F49MUY041948;
	Fri, 15 Jan 2010 04:09:22 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201001150409.o0F49MUY041948@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 15 Jan 2010 04:09:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202340 - head/usr.sbin/mergemaster
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jan 2010 04:09:22 -0000

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."