projects
/
shutils.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vim: add showcolors
[shutils.git]
/
dotfiles
/
gitconfig
diff --git
a/dotfiles/gitconfig
b/dotfiles/gitconfig
index 7ff03478e7261f04acfac7e40bc6f6b72b1a7f45..d31aa9e6ee118f00da5990e5cba7acf9775b7954 100644
(file)
--- a/
dotfiles/gitconfig
+++ b/
dotfiles/gitconfig
@@
-8,7
+8,10
@@
editor = vim
pager = less -FXRS -x4
[merge]
- tool = gvimdiff
+ tool = splice
+[mergetool "splice"]
+ cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+ trustExitCode = true
[alias]
wdiff = diff --color-words
wlog = log --color-words