tortoisemerge 1.6.7, winmerge 2.14.0