git: Swapping aliases for the difftool
.vimrc: Disabling NeoComplCache for git commits.