Mercurial > dotfiles

diff dot_gitconfig.tmpl @ 625:c8960ba7f019

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update settings for settle.nvim
author zegervdv <zegervdv@me.com>
date Thu, 04 Aug 2022 22:04:39 +0200
parents cf71ce0b06d3
children abf8938c8c6c
line wrap: on
line diff
--- a/dot_gitconfig.tmpl	Mon Aug 01 10:26:46 2022 +0200
+++ b/dot_gitconfig.tmpl	Thu Aug 04 22:04:39 2022 +0200
@@ -15,9 +15,9 @@
 [gpg]
 	program = gpg
 [merge]
-	tool = splice
-[mergetool "splice"]
-	cmd = "nvim -f $BASE $LOCAL $REMOTE $MERGED -c 'MergeInit'"
+	tool = settle
+[mergetool "settle"]
+	cmd = "nvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SettleInit'"
 	trustExitCode = true
 [alias]
 	ls = log --format=\"%C(auto)%h %<(15)%C(auto, green)%cr %>(20)%C(auto, magenta)%an %C(auto)%s %D\"