From owner-cvs-all  Sat Apr  1 18:47:26 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0369437B8BB; Sat,  1 Apr 2000 18:47:23 -0800 (PST)
	(envelope-from alfred@FreeBSD.org)
Received: (from alfred@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id SAA93611;
	Sat, 1 Apr 2000 18:47:22 -0800 (PST)
	(envelope-from alfred@FreeBSD.org)
Message-Id: <200004020247.SAA93611@freefall.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Sat, 1 Apr 2000 18:47:21 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

alfred      2000/04/01 18:47:21 PST

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Make mergemaster only take single letters for options as well as loop
  asking a question again if given an invalid input instead of assuming
  what the user wants.  /etc is not the place to make assumptions when
  given invalid input.
  
  Reformat some of the more convoluted code into seperate functions instead
  of being inline using tabs instead of space indents.
  
  Allow the user to view merged files they created with sdiff.
  
  Allow the user to redisplay the diff between the installed file and
  the new file again.
  
  Time wasted waiting for review: 1 month 2 weeks
  
  Revision  Changes    Path
  1.7       +168 -115  src/usr.sbin/mergemaster/mergemaster.sh



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