prepare diff (2)
use filename index for fns
real string compare in ch
merge master