added diffmerge as my mergetool