Date: Thu, 18 Jun 2009 10:34:54 +0200 From: Erwan David <erwan@rail.eu.org> To: freebsd-stable@freebsd.org Subject: Upgrade from 7.1-RELEASE to 7.2-RELEASE through freebsd update Message-ID: <20090618083454.GQ5002@trusted-logic.com>
next in thread | raw e-mail | index | archive | help
I tried to upgrade my 7.1-RELEASE into 7.2-RELEASE. However
freebsd-update kept asking me to merge every file in /etc whose $Id$
line changed (that makes about all files).
Is there a way, as with mergemaster, to make it not consider the $Id$
line for the manual merge ?
Thank you.
--
Erwan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090618083454.GQ5002>