freebsd-update

[Ivan Voras]

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...?

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 391 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20140121/040c5183/attachment.sig>