Merge pull request #1 from barretlee/fix-diffopt-error

fix: stock vim on Catalina does not support diffopt+=vertical
barretlee · Dec 3, 2021 · 960f7e7 · 960f7e7
2 parents 42a313b + d1d09f6
commit 960f7e7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/vimrc b/vimrc
@@ -177,7 +177,9 @@ set spellfile=$HOME/.vim-spell-en.utf-8.add
 set complete+=kspell
 
 " Always use vertical diffs
-set diffopt+=vertical
+if &diff
+  set diffopt+=vertical
+endif
 
 " Local config
 if filereadable($HOME . "/.vimrc.local")