gitconfig: refactor diff and merge tools

gitconfig

@@ -1,33 +1,42 @@
 [user]
 	name = Henrik Lissner
 	email = henrik@lissner.net
+
 [github]
 	user = hlissner
+
 [core]
 	excludesfile = ~/.gitignore
 	whitespace = trailing-space
-	pager = less -r
+
 [color]
 	ui = true
+
 [diff]
-	tool = vimdiff
-[difftool]
+	tool = vdiff
+[difftool "vdiff"]
 	prompt = false
 	cmd = vimdiff \"$LOCAL\" \"$REMOTE\"
 [difftool "ediff"]
 	cmd = emacsclient -n --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\"
+
 [merge]
 	# Include summaries of merged commits in newly created merge commit messages
 	log = true
-	tool = ediff
-[mergetool "ediff"]
+	tool = vmerge
+[mergetool "vmerge"]
+	cmd           = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+	trustExitCode = true
+[mergetool "emerge"]
 	cmd = emacsclient -c -a \"\"  --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
+
 [rebase]
 	autosquash = true
 [push]
 	default = simple
 [credential]
 	helper = osxkeychain
+
 [alias]
 	root = rev-parse --show-toplevel
 	undo-commit = reset --soft "HEAD^"