From owner-cvs-src-old@FreeBSD.ORG  Fri Jan 15 04:09:33 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4BEBC1065760
	for <cvs-src-old@freebsd.org>; Fri, 15 Jan 2010 04:09:33 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B9B18FC1A
	for <cvs-src-old@freebsd.org>; Fri, 15 Jan 2010 04:09:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0F49W8n071987
	for <cvs-src-old@freebsd.org>; Fri, 15 Jan 2010 04:09:32 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0F49W2r071986
	for cvs-src-old@freebsd.org; Fri, 15 Jan 2010 04:09:32 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <201001150409.o0F49W2r071986@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	dougb@repoman.freebsd.org using -f
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 15 Jan 2010 04:09:22 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jan 2010 04:09:33 -0000

dougb       2010-01-15 04:09:22 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 202340 on 2010-01-15 04:09:22Z by dougb
  
  Oops, deleted one line too many. Add back the null case for IGNORE_MOTD
  
  Revision  Changes    Path
  1.82      +1 -0      src/usr.sbin/mergemaster/mergemaster.sh