✨ Change default diff editor to merge

The `diff` view requires use of proposed APIs. Swap the default to the one that will both work without special measures and will let the extension be published to the extension markplace. Ref: konveyor#222 Signed-off-by: Scott J Dickerson <[email protected]>
sjd78 · Jan 30, 2025 · d09c610 · d09c610
1 parent 2f4a371
commit d09c610
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/vscode/package.json b/vscode/package.json
@@ -507,7 +507,7 @@
             "diff",
             "merge"
           ],
-          "default": "diff",
+          "default": "merge",
           "description": "Select the editor to use when resolving proposed solutions.",
           "scope": "window",
           "order": 7