From owner-cvs-all  Sun Feb  9 22:35:37 2003
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7586737B401; Sun,  9 Feb 2003 22:35:35 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1148743FE9; Sun,  9 Feb 2003 22:35:35 -0800 (PST)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1A6ZYbv007779;
	Sun, 9 Feb 2003 22:35:34 -0800 (PST)
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1A6ZYVN007778;
	Sun, 9 Feb 2003 22:35:34 -0800 (PST)
Message-Id: <200302100635.h1A6ZYVN007778@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 9 Feb 2003 22:35:34 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org, legacy-committers@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8
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       2003/02/09 22:35:34 PST

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  Try to fix two problems with the -I example. One is the fact that we
  want to match a character $, not EOL. The other is that CVS helpfully
  expanded my example into an actual CVS tag.
  
  Submitted by:   gad
  
  Revision  Changes    Path
  1.26      +1 -1      src/usr.sbin/mergemaster/mergemaster.8

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