TortoiseMerge hates life ...