use diffmerge as mergetool