Date: Mon, 17 Dec 2012 09:23:00 -0500 From: Randy Bush <randy@psg.com> To: Ask =?ISO-8859-1?Q?Bj=F8rn?= Hansen <ask@develooper.com> Cc: freebsd-stable@freebsd.org Subject: Re: freebsd-update mergemaster options Message-ID: <m2zk1cwyez.wl%randy@psg.com> In-Reply-To: <612DB7D4-07CA-4C48-98F8-081C33E85812@develooper.com> References: <612DB7D4-07CA-4C48-98F8-081C33E85812@develooper.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?m2zk1cwyez.wl%randy>