From 3fe24e6486ede5fcf5823340eb6a930355725b8b Mon Sep 17 00:00:00 2001
From: Ilya Grigoriev <ilyagr@users.noreply.github.com>
Date: Sat, 8 Feb 2025 17:09:07 -0800
Subject: [PATCH] json schema: update some defaults to their modern values

---
 cli/src/config-schema.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cli/src/config-schema.json b/cli/src/config-schema.json
index 7aacdc0e336..98b61e5c63c 100644
--- 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"