diff --git a/src/plumbing/options/mod.rs b/src/plumbing/options/mod.rs index d2cd78850cf..4d6722895ac 100644 --- a/src/plumbing/options/mod.rs +++ b/src/plumbing/options/mod.rs @@ -406,7 +406,7 @@ pub mod merge { #[clap(value_name = "BASE", value_parser = crate::shared::AsBString)] base: BString, /// A path or revspec to their file. - #[clap(value_name = "OURS", value_parser = crate::shared::AsBString)] + #[clap(value_name = "THEIRS", value_parser = crate::shared::AsBString)] theirs: BString, },