fd175e74b3
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. |
||
---|---|---|
.. | ||
Makefile | ||
Makefile.m4 | ||
makemap.8 | ||
makemap.c |
fd175e74b3
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. |
||
---|---|---|
.. | ||
Makefile | ||
Makefile.m4 | ||
makemap.8 | ||
makemap.c |