From owner-cvs-all  Tue Feb 12  1:59:10 2002
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8C6C137B41B; Tue, 12 Feb 2002 01:59:07 -0800 (PST)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g1C9su645014;
	Tue, 12 Feb 2002 01:54:56 -0800 (PST)
	(envelope-from dougb)
Message-Id: <200202120954.g1C9su645014@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 12 Feb 2002 01:54:56 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

dougb       2002/02/12 01:54:56 PST

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  * Update (c)
  * Fix a problem with files that have no CVS $Id's. Thanks to naddy for
  spotting this one. It wasn't a _huge_ problem since almost all the files
  we install (except motd) have one, but still, it's a bug.
  * Add a divider between diff outputs, which is helpful both for logs,
  and for giving a good visual clue for diffs that are smaller than
  $LINES. Another helpful suggestion from Gary W. Swearingen, swear@blarg.net.
  
  Revision  Changes    Path
  1.26      +6 -3      src/usr.sbin/mergemaster/mergemaster.sh

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message