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"