# HG changeset patch # User zegervdv # Date 1664655695 -7200 # Node ID 9f8854fc3cc2b0cd6822f137d456efd8ed319004 # Parent 723e5bae256ba35d687aff47f4ccee480f45f0ff Configure neovim as chezmoi mergetool diff -r 723e5bae256b -r 9f8854fc3cc2 .chezmoi.toml.tmpl --- 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 }}]