Adding diffmerge as the difftool of choice