From owner-cvs-src-old@FreeBSD.ORG  Sun Mar 14 05:23:04 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 DD6731065782
	for <cvs-src-old@freebsd.org>; Sun, 14 Mar 2010 05:23:04 +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 CBFCD8FC08
	for <cvs-src-old@freebsd.org>; Sun, 14 Mar 2010 05:23:04 +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 o2E5N4LG080730
	for <cvs-src-old@freebsd.org>; Sun, 14 Mar 2010 05:23:04 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2E5N4tH080729
	for cvs-src-old@freebsd.org; Sun, 14 Mar 2010 05:23:04 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <201003140523.o2E5N4tH080729@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, 14 Mar 2010 05:22:46 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
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: Sun, 14 Mar 2010 05:23:04 -0000

dougb       2010-03-14 05:22:46 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  SVN rev 205145 on 2010-03-14 05:22:46Z by dougb
  
  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.46      +9 -6      src/usr.sbin/mergemaster/mergemaster.8
  1.84      +13 -1     src/usr.sbin/mergemaster/mergemaster.sh