From 1faa6e6f13cfc3126ab673a5c3f04bd0cbf2bfc1 Mon Sep 17 00:00:00 2001
From: Stephania Thomas <stephania.thomas@zendesk.com>
Date: Tue, 7 Sep 2021 10:05:17 -0700
Subject: [PATCH] Fix Vim errors

Vim on Catalina doesn't suuport `diffopt=internal`
https://github.com/thoughtbot/dotfiles/issues/655
---
 gitconfig | 2 +-
 vimrc     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gitconfig b/gitconfig
index 64bdc8d406..c4c14f64e3 100644
--- a/gitconfig
+++ b/gitconfig
@@ -16,7 +16,7 @@
   l = log --pretty=colored
   br = branch
 [core]
-	excludesfile = /Users/gambaroff/.gitignore
+	excludesfile = /Users/stephania.thomas/.gitignore_global
   autocrlf = input
 [merge]
   ff = only
diff --git a/vimrc b/vimrc
index ac8dc0ec6b..cfd0eddc1c 100644
--- a/vimrc
+++ b/vimrc
@@ -180,7 +180,10 @@ set noeb vb t_vb=
 set complete+=kspell
 
 " Always use vertical diffs
-set diffopt+=vertical
+if &diff
+    set diffopt-=internal
+    set diffopt+=vertical
+endif
 
 " Local config
 if filereadable($HOME . "/.vimrc.local")