Date: Tue, 21 Jan 2014 14:49:00 +0100 From: Ivan Voras <ivoras@freebsd.org> To: freebsd-current@freebsd.org Subject: freebsd-update Message-ID: <lblts0$9o1$1@ger.gmane.org>
next in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --xHdLP4BcmJukl7bttIqAP9ENRicwN13BO Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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 =3D=3D=3D=3D=3D=3D=3D 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...? --xHdLP4BcmJukl7bttIqAP9ENRicwN13BO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iKYEARECAGYFAlLeesxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl bnBncC5maWZ0aGhvcnNlbWFuLm5ldDYxNDE4MkQ3ODMwNDAwMDJFRUIzNDhFNUZE MDhENTA2M0RGRjFEMkMACgkQ/QjVBj3/HSzc9ACfY/qZcziUz0RKgTMXvMfdg2a0 Fv0AnifKf//KNOw+WN/TZyAo0sjWfVQm =vnFW -----END PGP SIGNATURE----- --xHdLP4BcmJukl7bttIqAP9ENRicwN13BO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?lblts0$9o1$1>