freebsd-update mergemaster options

[Randy Bush]

> 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