freebsd-update auto merge fails on trivial VC lines

Tue Jan 10 14:06:36 UTC 2012

Hello,

When upgrading from FreeBSD 8.2-RELEASE to 9.0-RELEASE using freebsd-update, I'm asked to merge, what seems like, everything in /etc manually.
And all of the merges are trivial version controls lines.

E.g. my /etc/amd.map (which I never modified) begins with:

# $FreeBSD: releng/8.2/etc/amd.map 164015 2006-11-06 01:42:11Z obrien $

And this file (and line) freebsd-update asks me to manually merge. I wonder why that is.

Kind regards,

-- 
Martin Koch Andersen
http://925.dk