Merge pull request #230 from treppo/patch-1

Configure Macvim as the standard git mergetool

git/gitconfig

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