From owner-cvs-src-old@FreeBSD.ORG  Sun Apr 10 03:55:17 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84297106564A
	for <cvs-src-old@freebsd.org>; Sun, 10 Apr 2011 03:55:17 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 581C58FC0A
	for <cvs-src-old@freebsd.org>; Sun, 10 Apr 2011 03:55:17 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p3A3tHQC089895
	for <cvs-src-old@freebsd.org>; Sun, 10 Apr 2011 03:55:17 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p3A3tHbP089894
	for cvs-src-old@freebsd.org; Sun, 10 Apr 2011 03:55:17 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <201104100355.p3A3tHbP089894@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	dougb@repoman.freebsd.org using -f
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 10 Apr 2011 03:53:06 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src Makefile
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Apr 2011 03:55:17 -0000

dougb       2011-04-10 03:53:06 UTC

  FreeBSD src repository

  Modified files:
    .                    Makefile 
  Log:
  SVN rev 220512 on 2011-04-10 03:53:06Z by dougb
  
  Update recommendation for mergemaster. The -a and -i options are exclusive.
  
  PR:             docs/156271
  Submitted by:   Fedor Dikarev <fedor.dikarev@gmail.com>
  
  Revision  Changes    Path
  1.388     +1 -1      src/Makefile