Removed ksdiff as mergetool