From 406171c78958d24f99c34400a39e1ad218a94637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3n=C3=A1n=20Duddy?= <work+github@ronanduddy.com>
Date: Mon, 15 Mar 2021 12:06:11 +0000
Subject: [PATCH] Fix diffopt+=vertical issue

From https://github.com/thoughtbot/dotfiles/issues/655
---
 vimrc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vimrc b/vimrc
index fc66370cf8..c9ed3e05d0 100644
--- a/vimrc
+++ b/vimrc
@@ -173,7 +173,11 @@ set spellfile=$HOME/.vim-spell-en.utf-8.add
 set complete+=kspell
 
 " Always use vertical diffs
-set diffopt+=vertical
+" set diffopt+=vertical
+if &diff
+  set diffopt-=internal
+  set diffopt+=vertical
+endif
 
 " Local config
 if filereadable($HOME . "/.vimrc.local")