From owner-cvs-all  Tue May 28  0:25:47 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 B384337B401; Tue, 28 May 2002 00:25:44 -0700 (PDT)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4S7Pic42551;
	Tue, 28 May 2002 00:25:44 -0700 (PDT)
	(envelope-from dougb)
Message-Id: <200205280725.g4S7Pic42551@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 28 May 2002 00:25:44 -0700 (PDT)
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/05/28 00:25:44 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Actually accept the default argument to SCREEN_WIDTH.
  
  Submitted by:   brian
  
  Revision  Changes    Path
  1.31      +3 -0      src/usr.sbin/mergemaster/mergemaster.sh

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