From owner-cvs-all  Mon May 28  2:35:35 2001
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 307F437B424; Mon, 28 May 2001 02:35:31 -0700 (PDT)
	(envelope-from dougb@FreeBSD.org)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f4S9ZVd40531;
	Mon, 28 May 2001 02:35:31 -0700 (PDT)
	(envelope-from dougb)
Message-Id: <200105280935.f4S9ZVd40531@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 28 May 2001 02:35:31 -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?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

dougb       2001/05/28 02:35:30 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Fix a problem when user selects -a (auto run) but we encounter a file
  missing on the system. Instead of passing it by, mm was prompting...
  bad mm, no cookie!
  
  Brought to my attention by the PR, but the fix needed to be tweaked to
  handle the auto-install option as well.
  
  PR:		misc/25731 Gilbert Gong <ggong@cal.alumni.berkeley.edu>
  
  Revision  Changes    Path
  1.20      +17 -2     src/usr.sbin/mergemaster/mergemaster.sh


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