Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update gitconfig

  • Loading branch information...
commit 30c72262cde43dd43e642f675f4fb5e4aff23efb 1 parent 28a49cc
@dmedvinsky authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 gitconfig
View
8 gitconfig
@@ -22,14 +22,14 @@
whitespace = fix
[diff]
renames = copies
- tool = vimdiff-g
+ tool = vimdiff
[merge]
stat = true
conflictstyle = diff3
- tool = threesome
-[difftool "vimdiff-g"]
+ tool = splice
+[difftool "vimdiff"]
cmd = "vim -d -f $LOCAL $REMOTE"
-[mergetool "threesome"]
+[mergetool "splice"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[difftool]
Please sign in to comment.
Something went wrong with that request. Please try again.