From owner-cvs-src-old@FreeBSD.ORG  Wed Mar 17 07:27:23 2010
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 A050E1065676
	for <cvs-src-old@freebsd.org>; Wed, 17 Mar 2010 07:27:23 +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 8E9438FC22
	for <cvs-src-old@freebsd.org>; Wed, 17 Mar 2010 07:27:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2H7RNKp074303
	for <cvs-src-old@freebsd.org>; Wed, 17 Mar 2010 07:27:23 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2H7RN5t074302
	for cvs-src-old@freebsd.org; Wed, 17 Mar 2010 07:27:23 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <201003170727.o2H7RN5t074302@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: Wed, 17 Mar 2010 07:26:59 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh
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: Wed, 17 Mar 2010 07:27:23 -0000

dougb       2010-03-17 07:26:59 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  SVN rev 205246 on 2010-03-17 07:26:59Z by dougb
  
  MFC r205145:
  
  Make it more clear in the docs that -a is not compatible with -iFU,
  and enforce this in the code. Apparently a lot of users mistakenly
  combine -a with these flags and are then mystified that no changes
  were made.
  
  While I'm here, fix a trailing space in mergemaster.8
  
  Revision  Changes    Path
  1.36.2.5  +9 -6      src/usr.sbin/mergemaster/mergemaster.8
  1.54.2.9  +13 -1     src/usr.sbin/mergemaster/mergemaster.sh