add vcscommand to neovim

robacarp · Jan 4, 2016 · deb45b9 · deb45b9
1 parent 0f4d1d6
commit deb45b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.config/nvim/bundle/vcscommand b/.config/nvim/bundle/vcscommand
@@ -0,0 +1 @@
+../../../.vim/bundle/vcscommand/
diff --git a/.gitconfig b/.gitconfig
@@ -16,3 +16,5 @@
   excludesfile = ~/.gitignore_global
 [color "status"]
 	branch = magenta
+[merge]
+	tool = opendiff