Permalink
Browse files

Git - update mergetool

  • Loading branch information...
1 parent ab41263 commit b80c580a83bd8675f91c4197153112924f9db012 Jacob Silva committed Mar 6, 2013
Showing with 4 additions and 2 deletions.
  1. +3 −1 git/gitconfig
  2. +1 −1 vim/vim/bundle/vundle
View
@@ -10,9 +10,11 @@
editor = vim -c ':normal gg'
[merge]
- tool = vimdiff
+ tool = fugitive
[commit]
template = ~/.git.commit.template
[alias]
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+[mergetool "fugitive"]
+ cmd = vim -f -c \"Gdiff\" \"$MERGED\"

0 comments on commit b80c580

Please sign in to comment.