From owner-cvs-src@FreeBSD.ORG  Thu Jul  7 22:55:41 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 50AD516A41C;
	Thu,  7 Jul 2005 22:55:41 +0000 (GMT)
	(envelope-from obrien@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1B59F43D46;
	Thu,  7 Jul 2005 22:55:41 +0000 (GMT)
	(envelope-from obrien@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j67MteNN001343;
	Thu, 7 Jul 2005 22:55:40 GMT
	(envelope-from obrien@repoman.freebsd.org)
Received: (from obrien@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j67Mteb3001342;
	Thu, 7 Jul 2005 22:55:40 GMT (envelope-from obrien)
Message-Id: <200507072255.j67Mteb3001342@repoman.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Thu, 7 Jul 2005 22:55:40 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Cc: 
Subject: cvs commit: src/contrib/diff diff.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jul 2005 22:55:41 -0000

obrien      2005-07-07 22:55:40 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    contrib/diff         diff.c 
  Log:
  MFC: rev. 1.5: later options nullify mutually exclusive earlier options.
  
  Revision  Changes    Path
  1.4.8.1   +1 -4      src/contrib/diff/diff.c