diff --git a/cli/src/commands/commit.rs b/cli/src/commands/commit.rs
index 8063f3f707..7bc79afa61 100644
--- a/cli/src/commands/commit.rs
+++ b/cli/src/commands/commit.rs
@@ -33,7 +33,7 @@ pub(crate) struct CommitArgs {
     interactive: bool,
     /// Specify diff editor to be used (implies --interactive)
     #[arg(long, value_name = "NAME")]
-    pub tool: Option<String>,
+    tool: Option<String>,
     /// The change description to use (don't open editor)
     #[arg(long = "message", short, value_name = "MESSAGE")]
     message_paragraphs: Vec<String>,
diff --git a/cli/src/commands/diffedit.rs b/cli/src/commands/diffedit.rs
index 5999988966..1cb8a326ca 100644
--- a/cli/src/commands/diffedit.rs
+++ b/cli/src/commands/diffedit.rs
@@ -53,7 +53,7 @@ pub(crate) struct DiffeditArgs {
     to: Option<RevisionArg>,
     /// Specify diff editor to be used
     #[arg(long, value_name = "NAME")]
-    pub tool: Option<String>,
+    tool: Option<String>,
 }
 
 #[instrument(skip_all)]
diff --git a/cli/src/commands/move.rs b/cli/src/commands/move.rs
index 7124119a66..c22d153cf0 100644
--- a/cli/src/commands/move.rs
+++ b/cli/src/commands/move.rs
@@ -52,7 +52,7 @@ pub(crate) struct MoveArgs {
     interactive: bool,
     /// Specify diff editor to be used (implies --interactive)
     #[arg(long, value_name = "NAME")]
-    pub tool: Option<String>,
+    tool: Option<String>,
     /// Move only changes to these paths (instead of all paths)
     #[arg(conflicts_with_all = ["interactive", "tool"], value_hint = clap::ValueHint::AnyPath)]
     paths: Vec<String>,
diff --git a/cli/src/commands/resolve.rs b/cli/src/commands/resolve.rs
index c12cf7def9..7db0040e5e 100644
--- a/cli/src/commands/resolve.rs
+++ b/cli/src/commands/resolve.rs
@@ -57,7 +57,7 @@ pub(crate) struct ResolveArgs {
     quiet: bool,
     /// Specify 3-way merge tool to be used
     #[arg(long, conflicts_with = "list", value_name = "NAME")]
-    pub tool: Option<String>,
+    tool: Option<String>,
     /// Restrict to these paths when searching for a conflict to resolve. We
     /// will attempt to resolve the first conflict we can find. You can use
     /// the `--list` argument to find paths to use here.
diff --git a/cli/src/commands/split.rs b/cli/src/commands/split.rs
index b887b3c2c0..740fbbb008 100644
--- a/cli/src/commands/split.rs
+++ b/cli/src/commands/split.rs
@@ -43,7 +43,7 @@ pub(crate) struct SplitArgs {
     interactive: bool,
     /// Specify diff editor to be used (implies --interactive)
     #[arg(long, value_name = "NAME")]
-    pub tool: Option<String>,
+    tool: Option<String>,
     /// The revision to split
     #[arg(long, short, default_value = "@")]
     revision: RevisionArg,
diff --git a/cli/src/commands/squash.rs b/cli/src/commands/squash.rs
index cef4712206..ce529f124c 100644
--- a/cli/src/commands/squash.rs
+++ b/cli/src/commands/squash.rs
@@ -47,7 +47,7 @@ pub(crate) struct SquashArgs {
     interactive: bool,
     /// Specify diff editor to be used (implies --interactive)
     #[arg(long, value_name = "NAME")]
-    pub tool: Option<String>,
+    tool: Option<String>,
     /// Move only changes to these paths (instead of all paths)
     #[arg(conflicts_with_all = ["interactive", "tool"], value_hint = clap::ValueHint::AnyPath)]
     paths: Vec<String>,
diff --git a/cli/src/commands/unsquash.rs b/cli/src/commands/unsquash.rs
index 9cc7644747..1aa63a24f7 100644
--- a/cli/src/commands/unsquash.rs
+++ b/cli/src/commands/unsquash.rs
@@ -46,7 +46,7 @@ pub(crate) struct UnsquashArgs {
     interactive: bool,
     /// Specify diff editor to be used (implies --interactive)
     #[arg(long, value_name = "NAME")]
-    pub tool: Option<String>,
+    tool: Option<String>,
 }
 
 #[instrument(skip_all)]