[git] added diffmerge as default mergetool