Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli: inform the user of the command which disables the hint #3017

Merged
merged 1 commit into from
Feb 11, 2024
Merged

cli: inform the user of the command which disables the hint #3017

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cli/src/merge_tools/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The string should probably interpolate BUILTIN_EDITOR_NAME as well :)

to disable this message."
)
.map_err(ExternalToolError::Io)?;
Ok(default_editor.into())
Expand Down