Remove nvim for now

bashrc

@@ -59,7 +59,7 @@ fi
 
 # allow ctrl+S in vim to save files, ie pass the command to vim when vim is open.
 export EDITOR="vim"
-alias vim="nvim"
+#alias vim="nvim"
 
 dot_sync() {
   current_branch=$(git branch | grep '\*.*' | cut -d '*' -f 2 | tr -d ' ')

gitconfig

@@ -10,7 +10,7 @@
 [mergetool]
   prompt = false
 [core]
-  editor = nvim
+  editor = vim
 [alias]
   lol = log --oneline
   c = commit
@@ -21,8 +21,9 @@
   ca = commit -a
   d = diff
   ch = checkout
-[mergetool "vimdiff"]
-  cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd W' -c '$wincmd J'
+	;ch = "!~/.gitexplode"
+;[mergetool "vimdiff"]
+  ;cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd W' -c '$wincmd J'
 [diff]
   tool = vimdiff
 [color]

zshrc

@@ -21,8 +21,8 @@ eval "$(hub alias -s)"
 
 # Allow ctrl+S in vim to save files, ie pass
 # the command to vim when vim is open.
-export EDITOR="nvim"
-alias vim="nvim"
+#export EDITOR="nvim"
+#alias vim="nvim"
 
 dot_sync() {
   current_branch=$(git branch | grep '\*.*' | cut -d '*' -f 2 | tr -d ' ')