Adding diffmerge as mergetool for git