Adds fugitive as mergetool to gitconfig

this adds fugitive as the default tool for doing merges.