Use tortoisediff as default diff tool
Skip user interaction for trivial merges in semanticmerge