Use fugitive as vim's mergetool
Revert "gitconfig merge.conflictstyle diff3"

This reverts commit cd956885c7f8c2c205f6f6594b57d49e6c1093fe.

Conflicts:
	gitconfig