1 files changed, 6 insertions, 0 deletions
diff --git a/.vimrc b/.vimrc
index d65b174..f27cd09 100644
--- a/.vimrc
+++ b/.vimrc
@@ -48,6 +48,12 @@ let NERDTreeIgnore = ['\.pyc$', '\.tar\.gz$']
 "
 " others
 "
+if &diff
+  " pass setting shell for vimdiff as it caused auto-stop for some reason
+else
+  " normal mode
+  set shell=/bin/bash\ -i
+endif
 
 " http://vim.wikia.com/wiki/Always_start_on_first_line_of_git_commit_message
 au FileType gitcommit au! BufEnter COMMIT_EDITMSG call setpos('.', [0, 1, 1, 0])