TortoiseMerge 1.6.7, WinMerge 2.14.0