From b80775e48472344a28859b79cd4096e5b98d10f2 Mon Sep 17 00:00:00 2001
From: Xevion <xevion@xevion.dev>
Date: Fri, 11 Oct 2024 14:49:12 -0500
Subject: [PATCH] Use VS Code for merges

---
 .chezmoi.toml.tmpl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl
index fbc5076..776998b 100644
--- a/.chezmoi.toml.tmpl
+++ b/.chezmoi.toml.tmpl
@@ -24,6 +24,13 @@
 {{-   $cpuThreads = (output "powershell.exe" "-NoProfile" "-NonInteractive" "-Command" "(Get-CimInstance -ClassName 'Win32_Processor').NumberOfLogicalProcessors") | trim | atoi }}
 {{- end -}}
 
+[merge]
+command = "bash"
+args = [
+    "-c",
+    "cp {{ "{{" }} .Target {{ "}}" }} {{ "{{" }} .Target {{ "}}" }}.base && code --new-window --wait --merge {{ "{{" }} .Destination {{ "}}" }} {{ "{{" }} .Target {{ "}}" }} {{ "{{" }} .Target {{ "}}" }}.base {{ "{{" }} .Source {{ "}}" }}",
+]
+
 [data]
 	chassis = "{{ $chassisType }}"