I don't have to manually resolve conflicts on every import. Ironically, most of these files have no changes from the vendor version except the $FreeBSD$ line.
I don't have to manually resolve conflicts on every import. Ironically, most of these files have no changes from the vendor version except the $FreeBSD$ line.