From 0727b5679f9ddeb05a9a50c895b6d77ba61ed544 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 25 Nov 2024 08:51:34 +0100 Subject: [PATCH] fix: `gix merge file` now uses `THEIRS` instead of `OURS` where needed (#1703) --- src/plumbing/options/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, },