Git diff settings

Following https://www.micahsmith.com/blog/2019/11/fixing-vim-invalid-argument-diffopt-iwhite/, which I found here: thoughtbot/dotfiles#655
kevin-j-m · Dec 28, 2020 · b412c5e · b412c5e
1 parent 33d590b
commit b412c5e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.vimrc b/.vimrc
@@ -186,7 +186,10 @@ set spellfile=$HOME/.vim-spell-en.utf-8.add
 set complete+=kspell
 
 " Always use vertical diffs
-set diffopt+=vertical
+if &diff
+    set diffopt-=internal
+    set diffopt+=iwhite
+endif
 
 " vim-rspec
 " ==========