Fix working with external diff tools
Add example settings for tortoiseMerge