Yes, there will be conflicts on just about every file. There is a
significant mainline after the initial import, and the "-j" merge conflicts
on the $Id$ lines... Yuck! (These comments apply to the rest of the
imports)
Obtained from: Paul Vixie <paul@vix.com>