Permalink
Browse files

Configure Macvim as the standard git mergetool

Why use something else than Macvim with fugitive.vim as a mergetool?
  • Loading branch information...
1 parent da37a32 commit b368dfd0a7a160940cce6aea194cce64b4e6cdda Christian Treppo committed Jan 6, 2013
Showing with 6 additions and 0 deletions.
  1. +6 −0 git/gitconfig
View
@@ -84,9 +84,15 @@
svnl = svn log --oneline --show-commit
[format]
pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset
+[mergetool]
+ prompt = false
+[mergetool "mvimdiff"]
+ cmd="mvim -c 'Gdiff' $MERGED" # use fugitive.vim for 3-way merge
+ keepbackup=false
[merge]
summary = true
verbosity = 1
+ tool = mvimdiff
[apply]
whitespace = nowarn
[branch]

0 comments on commit b368dfd

Please sign in to comment.