Configure Macvim as the standard git mergetool

Why use something else than Macvim with fugitive.vim as a mergetool?
This commit is contained in:
Christian Treppo 2013-01-06 18:02:02 +01:00
parent da37a32f4b
commit b368dfd0a7

View File

@ -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]