Move merge.{h,c} into wiretap: these modules use wiretap to merge files.