From owner-freebsd-stable@FreeBSD.ORG  Mon Dec 17 14:23:03 2012
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A16D68B7
 for <freebsd-stable@freebsd.org>; Mon, 17 Dec 2012 14:23:03 +0000 (UTC)
 (envelope-from randy@psg.com)
Received: from ran.psg.com (ran.psg.com [IPv6:2001:418:1::36])
 by mx1.freebsd.org (Postfix) with ESMTP id 81A618FC13
 for <freebsd-stable@freebsd.org>; Mon, 17 Dec 2012 14:23:03 +0000 (UTC)
Received: from localhost ([127.0.0.1] helo=ryuu.psg.com.psg.com)
 by ran.psg.com with esmtp (Exim 4.80.1 (FreeBSD))
 (envelope-from <randy@psg.com>)
 id 1Tkbav-0000Gf-He; Mon, 17 Dec 2012 14:23:01 +0000
Date: Mon, 17 Dec 2012 09:23:00 -0500
Message-ID: <m2zk1cwyez.wl%randy@psg.com>
From: Randy Bush <randy@psg.com>
To: Ask =?ISO-8859-1?Q?Bj=F8rn?= Hansen <ask@develooper.com>
Subject: Re: freebsd-update mergemaster options
In-Reply-To: <612DB7D4-07CA-4C48-98F8-081C33E85812@develooper.com>
References: <612DB7D4-07CA-4C48-98F8-081C33E85812@develooper.com>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/22.3 Mule/5.0 (SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.7 - "Harue")
Content-Type: text/plain; charset=US-ASCII
Cc: freebsd-stable@freebsd.org
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 14:23:03 -0000

> I am getting hundreds of files with "conflicts" like:
> <<<<<<< current version
> # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $
> =======
> # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.8.1 2012/03/03 06:15:13 kensmith Exp $
> >>>>>>> 8.3-RELEASE

mergemaster took the master part of its name a bit seriously

i use -cviFU

randy