From owner-cvs-src@FreeBSD.ORG  Tue Jun 17 02:20:17 2003
Return-Path: <owner-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 271D237B407; Tue, 17 Jun 2003 02:20:17 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id AE16B43F3F; Tue, 17 Jun 2003 02:20:16 -0700 (PDT)
	(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 h5H9KG0U095715;
	Tue, 17 Jun 2003 02:20:16 -0700 (PDT)
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5H9KGWn095714;
	Tue, 17 Jun 2003 02:20:16 -0700 (PDT)
Message-Id: <200306170920.h5H9KGWn095714@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 17 Jun 2003 02:20:16 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/bind FREEBSD-Upgrade
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 17 Jun 2003 09:20:17 -0000

dougb       2003/06/17 02:20:16 PDT

  FreeBSD src repository

  Modified files:
    contrib/bind         FREEBSD-Upgrade 
  Log:
  Give an example of the more efficient conflict resolution command
  suggested by the version of the commit message that's mailed out
  as opposed to the more error prone version that will be suggested
  when doing the actual import.
  
  Revision  Changes    Path
  1.3       +2 -0      src/contrib/bind/FREEBSD-Upgrade