Configured git to properly use FileMerge for both difftool and mergetool