dos2unix. For some reason meldmerge added ^Ms

ugh. never had that happen before. one file is set ms dos just destroyed
each file afterwards with ^Ms