From owner-cvs-all  Mon Mar  5  2:13:31 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 64AD737B719; Mon,  5 Mar 2001 02:13:22 -0800 (PST)
	(envelope-from dougb@FreeBSD.org)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f25ADMJ73573;
	Mon, 5 Mar 2001 02:13:22 -0800 (PST)
	(envelope-from dougb)
Message-Id: <200103051013.f25ADMJ73573@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 5 Mar 2001 02:13:22 -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: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

dougb       2001/03/05 02:13:22 PST

  Modified files:
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  * Add two requested features, source'ing of /etc/mergemaster.rc, and
    asking the user to actually run the recommended commands related
    to installation of files such as aliases or login.conf.
  
  * Return to using grep for CVS $Id comparison. Using ident caused too
    many problems for people with local CVS/RCS tags in their stuff.
    Attempt to make portability a little easier to maintain in spite of
    this change by defining the name of the tag to search for. This
    is a slightly different change that solves the problem in the PR.
  
  PR:		bin/24564
  Submitted by:	Tony Finch <dot@dotat.at>
  
  Revision  Changes    Path
  1.14      +9 -3      src/usr.sbin/mergemaster/mergemaster.8
  1.17      +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