From 84ef2c931f4584a5dca9e4251709366d7d01fda1 Mon Sep 17 00:00:00 2001
From: Jcparkyn <51850908+Jcparkyn@users.noreply.github.com>
Date: Sun, 6 Oct 2024 10:50:12 +1100
Subject: [PATCH] fix: use correct program for merge-editor = "vscode" on
 Windows

fixes martinvonz/jj#4207
---
 cli/src/config/windows.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cli/src/config/windows.toml b/cli/src/config/windows.toml
index deca7a381..1028444dc 100644
--- a/cli/src/config/windows.toml
+++ b/cli/src/config/windows.toml
@@ -1,3 +1,6 @@
 [ui]
 pager = ":builtin"
 editor = "Notepad"
+
+[merge-tools.vscode]
+program = "code.cmd"