From 53b46d1d290d3351fd27793002954785dc38d920 Mon Sep 17 00:00:00 2001 From: Tyler Nguyen Date: Thu, 14 Nov 2024 23:07:45 -0600 Subject: [PATCH] refactor: inherit vscode docs snippet for chezmoi --- .chezmoi.toml.tmpl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl index 0e879d1..9891742 100644 --- a/.chezmoi.toml.tmpl +++ b/.chezmoi.toml.tmpl @@ -7,9 +7,13 @@ args = ["--wait"] [diff] - command = "code" - args = ["--wait", "--diff", "$LOCAL", "$REMOTE"] + tool = default-difftool + +[difftool "default-difftool"] + cmd = code --wait --diff $LOCAL $REMOTE [merge] - command = "code" - args = ["--wait", "$MERGED"] + tool = code + +[mergetool "code"] + cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED