From owner-cvs-all@FreeBSD.ORG  Tue Oct  2 16:13:09 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ECC0316A419;
	Tue,  2 Oct 2007 16:13:09 +0000 (UTC)
	(envelope-from roberto@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B37D813C48E;
	Tue,  2 Oct 2007 16:13:09 +0000 (UTC)
	(envelope-from roberto@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l92GD9og077931;
	Tue, 2 Oct 2007 16:13:09 GMT
	(envelope-from roberto@repoman.freebsd.org)
Received: (from roberto@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l92GD9Ww077930;
	Tue, 2 Oct 2007 16:13:09 GMT (envelope-from roberto)
Message-Id: <200710021613.l92GD9Ww077930@repoman.freebsd.org>
From: Ollivier Robert <roberto@FreeBSD.org>
Date: Tue, 2 Oct 2007 16:13:09 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/devel/mercurial/files patch-hgmerge
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 16:13:10 -0000

roberto     2007-10-02 16:13:09 UTC

  FreeBSD ports repository

  Added files:
    devel/mercurial/files patch-hgmerge 
  Log:
  A bug in our /bin/sh is making one of the tests fail when looking for a
  OS X only utility (FileMerge).  The bug has been fixed recently but as it
  is irrelevant to FreeBSD, remove the offending line to avoid tripping on
  the bug on older systems.
  
  This should fix hgmerge on these systems.
  
  Reminded by:            tobez
  
  Revision  Changes    Path
  1.3       +11 -0     ports/devel/mercurial/files/patch-hgmerge (new)