Upgrade from 7.1-RELEASE to 7.2-RELEASE through freebsd update

Erwan David erwan at rail.eu.org
Thu Jun 18 08:35:00 UTC 2009

	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.


More information about the freebsd-stable mailing list