json schema: update some defaults to their modern values

jj-vcs · Feb 11, 2025 · a3647a6 · a3647a6
1 parent 3f9e55f
commit a3647a6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/cli/src/config-schema.json b/cli/src/config-schema.json
@@ -184,11 +184,12 @@
                 "diff-editor": {
                     "type": "string",
                     "description": "Editor tool to use for editing diffs",
-                    "default": "meld"
+                    "default": ":builtin"
                 },
                 "merge-editor": {
                     "type": "string",
-                    "description": "Tool to use for resolving three-way merges. Behavior for a given tool name can be configured in merge-tools.TOOL tables"
+                    "description": "Tool to use for resolving three-way merges. Behavior for a given tool name can be configured in merge-tools.TOOL tables",
+                    "default": ":builtin"
                 },
                 "conflict-marker-style": {
                     "$ref": "#/properties/ui/definitions/conflict-marker-style"