Mercurial > dotfiles
changeset 681:9f8854fc3cc2
Configure neovim as chezmoi mergetool
| author | zegervdv <zegervdv@me.com> |
|---|---|
| date | Sat, 01 Oct 2022 22:21:35 +0200 |
| parents | 723e5bae256b |
| children | 02add24dd71d |
| files | .chezmoi.toml.tmpl |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
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 }}]