From owner-cvs-all  Sat May  4 15:45:15 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 876AB37B41A; Sat,  4 May 2002 15:45:12 -0700 (PDT)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g44MjCK04933;
	Sat, 4 May 2002 15:45:12 -0700 (PDT)
	(envelope-from dougb)
Message-Id: <200205042245.g44MjCK04933@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 4 May 2002 15:45:12 -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/04 15:45:12 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  * Add some niceties to make the -p option quieter, and better behaved
  * Take a simple idea about setting the screen width using stty (for sdiff's
  purposes) thoughtfully suggested by Joerg to an absurd conclusion.
  
  Revision  Changes    Path
  1.30      +28 -5     src/usr.sbin/mergemaster/mergemaster.sh

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