Use nvim for mergetool

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index f1d97f64c2fabdad5bf2aad1b3e29a43ba9c7358..faf73a85074b9aeda13ed6180ff8d49d367da6f7 100644 (file)
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -34,10 +34,6 @@ export NVM_DIR=$HOME/.nvm
 export PATH=$PATH:$HOME:${GOPATH//://bin:}/bin
 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS
 
 export PATH=$PATH:$HOME:${GOPATH//://bin:}/bin
 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS
 

-# Editor.
-export EDITOR="nvim"
-export VISUAL="nvim"
-

 # Python related variables
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 export WORKON_HOME=$HOME/.virtualenvs
 # Python related variables
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 export WORKON_HOME=$HOME/.virtualenvs