*.pnm -diff -text
Changelog    merge=union
