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
Hi,
On an 8.2 box, I run
freebsd-update -r 8.3-RELEASE upgrade
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
On 12/11/2012 12:58 AM, Ask Bjørn Hansen wrote:
Hi,
On an 8.2 box, I run
freebsd-update -r 8.3-RELEASE upgrade
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:
