X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=dotfiles%2Fgitconfig;h=d31aa9e6ee118f00da5990e5cba7acf9775b7954;hb=9cad7d0fe21304a6eef1621edf330378517ab4e9;hp=7ff03478e7261f04acfac7e40bc6f6b72b1a7f45;hpb=197017be815b01cf506736326eecb20a64044d84;p=shutils.git

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 7ff0347..d31aa9e 100644
--- 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