diff --git a/vimrc b/vimrc
index 8f9d078848..092320919e 100644
--- a/vimrc
+++ b/vimrc
@@ -173,6 +173,10 @@ set spellfile=$HOME/.vim-spell-en.utf-8.add
 " Autocomplete with dictionary words when spell check is on
 set complete+=kspell
 
+" Fix for MacOS issue described here:
+" https://github.com/thoughtbot/dotfiles/issues/655
+set diffopt-=internal
+
 " Always use vertical diffs
 set diffopt+=vertical