Added diffmerge to .gitconfig on ubuntu