freebsd-update
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--
討論串 (同標題文章)
完整討論串 (本文為第 4 之 19 篇)：