From d1d09f68dedaeeec0fa12177720a04cfbb2a4798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barret=E6=9D=8E=E9=9D=96?= <barret.china@gmail.com>
Date: Sat, 4 Dec 2021 01:47:00 +0800
Subject: [PATCH] fix: stock vim on Catalina does not support
 diffopt+=vertical, close #655

---
 vimrc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vimrc b/vimrc
index 3f5271076f..b0349a39c7 100644
--- 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")