From 75910861d6fb7c266d6eea9260eab177938078cd Mon Sep 17 00:00:00 2001
From: Benjamin Brittain <ben@brittain.org>
Date: Sat, 10 Feb 2024 11:50:56 -0500
Subject: [PATCH] cli: inform the user of the command which disables the hint

---
 cli/src/merge_tools/mod.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cli/src/merge_tools/mod.rs b/cli/src/merge_tools/mod.rs
index 6bbcfb4717..4f4ae0eaf4 100644
--- a/cli/src/merge_tools/mod.rs
+++ b/cli/src/merge_tools/mod.rs
@@ -175,7 +175,8 @@ fn editor_args_from_settings(
         let default_editor = BUILTIN_EDITOR_NAME;
         writeln!(
             ui.hint(),
-            "Using default editor '{default_editor}'; you can change this by setting {key}"
+            "Using default editor '{default_editor}'; run `jj config set --user {key} :builtin` \
+             to disable this message."
         )
         .map_err(ExternalToolError::Io)?;
         Ok(default_editor.into())