Mercurial > dotfiles

diff dot_gitconfig.tmpl @ 516:cf71ce0b06d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable merge.nvim
author zegervdv <zegervdv@me.com>
date Fri, 31 Dec 2021 12:18:50 +0100
parents 41a48a26b0aa
children c8960ba7f019
line wrap: on
line diff
--- a/dot_gitconfig.tmpl	Wed Dec 29 22:03:47 2021 +0100
+++ b/dot_gitconfig.tmpl	Fri Dec 31 12:18:50 2021 +0100
@@ -17,7 +17,7 @@
 [merge]
 	tool = splice
 [mergetool "splice"]
-	cmd = "nvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+	cmd = "nvim -f $BASE $LOCAL $REMOTE $MERGED -c 'MergeInit'"
 	trustExitCode = true
 [alias]
 	ls = log --format=\"%C(auto)%h %<(15)%C(auto, green)%cr %>(20)%C(auto, magenta)%an %C(auto)%s %D\"