From owner-cvs-all  Mon Mar  5 12:33:39 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 4EAF937B719; Mon,  5 Mar 2001 12:33:31 -0800 (PST)
	(envelope-from dougb@FreeBSD.org)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f25KXUg77872;
	Mon, 5 Mar 2001 12:33:30 -0800 (PST)
	(envelope-from dougb)
Message-Id: <200103052033.f25KXUg77872@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 5 Mar 2001 12:33:29 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh
X-FreeBSD-CVS-Branch: RELENG_4
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

dougb       2001/03/05 12:33:29 PST

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  MFC the return to grep instead of ident for CVS $Id tags, and the
  requested features of source'ing /etc/mergemaster.rc and prompting
  the user to run recommended commands like 'newaliases' as needed.
  
  Revision  Changes    Path
  1.5.2.5   +9 -3      src/usr.sbin/mergemaster/mergemaster.8
  1.6.2.6   +59 -16    src/usr.sbin/mergemaster/mergemaster.sh


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