Added vim-fugitive

2014-08-31 14:42:44 +02:00
parent b3a9d22f16 20b22f221b
commit aafbd94926
2 changed files with 7 additions and 0 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,9 @@
 [submodule "vim/bundle/bufexplorer"]
 	path = vim/bundle/bufexplorer
 	url = git@github.com:jlanzarotta/bufexplorer.git
+<<<<<<< HEAD
+=======
+[submodule "vim/bundle/vim-fugitive"]
+	path = vim/bundle/vim-fugitive
+	url = git@github.com:tpope/vim-fugitive
+>>>>>>> 20b22f221bbd693fed9797f0d13ae6a2ce168716
--- a/vim/bundle/vim-fugitive
+++ b/vim/bundle/vim-fugitive