Hi, Is there any way I can avoid manually resolving hundreds of merge conflicts of the following type while using freebsd-update ?
1 <<<<<<< current version 2 # $FreeBSD: release/9.0.0/etc/csh.cshrc 50472 1999-08-27 23:37:10Z peter $ 3 ======= 4 # $FreeBSD: release/10.0.0/etc/csh.cshrc 50472 1999-08-27 23:37:10Z peter $ 5 >>>>>>> 10.0-RELEASE ? I can't be the only one seeing those...?
signature.asc
Description: OpenPGP digital signature
