Mercurial > dotfiles

diff .chezmoi.toml.tmpl @ 681:9f8854fc3cc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure neovim as chezmoi mergetool
author zegervdv <zegervdv@me.com>
date Sat, 01 Oct 2022 22:21:35 +0200
parents 174245fca5a3
children 0b30faf23a07
line wrap: on
line diff
--- a/.chezmoi.toml.tmpl	Sat Oct 01 22:21:13 2022 +0200
+++ b/.chezmoi.toml.tmpl	Sat Oct 01 22:21:35 2022 +0200
@@ -31,3 +31,7 @@
    name = {{ $name | quote }}
    signingkey = {{ $signingkey | quote }}
    font_size = {{ $font_size | quote }}
+
+[merge]
+  command = "nvim"
+  args = ["-d", {{ "{{ .Destination }}" | quote }}, {{ "{{ .Source }}" | quote }}, {{ "{{ .Target }}" | quote }}]