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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "[email protected]"

Reply via email to