From owner-cvs-all  Thu Jun 20 12:44:52 2002
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 1D7E337B43B; Thu, 20 Jun 2002 12:44:35 -0700 (PDT)
Received: (from jmallett@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g5KJiZe56751;
	Thu, 20 Jun 2002 12:44:35 -0700 (PDT)
	(envelope-from jmallett)
Message-Id: <200206201944.g5KJiZe56751@freefall.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Thu, 20 Jun 2002 12:44:34 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.bin/make parse.c
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

jmallett    2002/06/20 12:44:34 PDT

  Modified files:
    usr.bin/make         parse.c 
  Log:
  Provide a heuristic for RCS conflicts.
  
  Obtained from:  NetBSD
  
  Revision  Changes    Path
  1.35      +9 -2      src/usr.bin/make/parse.c

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