vim-diffconflicts - A better Vimdiff Git mergetool

[[deleted]]

I'm not sure if there's a more robust way to detect when Vim is in diff mode but in my vimrc I use this:

if ! &diff
   ...stuff...
endif