From d384ca38a0092b6533a751a68075b2f090d47d48 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Mon, 20 Feb 2023 00:45:23 -0800 Subject: [PATCH] docstrings: Update to help string for `jj diffedit` Minor update to match the wording in parent commit. --- src/commands/mod.rs | 2 +- tests/test_global_opts.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/mod.rs b/src/commands/mod.rs index 470d2378b34..ef8eced9249 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -681,7 +681,7 @@ struct RestoreArgs { /// changes into or out of the parent revision. #[derive(clap::Args, Clone, Debug)] struct DiffeditArgs { - /// The revision to touch up. Defaults to @ if --to/--from are not + /// The revision to touch up. Defaults to @ if neither --to nor --from are /// specified. #[arg(long, short)] revision: Option, diff --git a/tests/test_global_opts.rs b/tests/test_global_opts.rs index 80a904294f9..2f0fb34b328 100644 --- a/tests/test_global_opts.rs +++ b/tests/test_global_opts.rs @@ -407,7 +407,7 @@ fn test_help() { Usage: jj diffedit [OPTIONS] Options: - -r, --revision The revision to touch up. Defaults to @ if --to/--from are not specified + -r, --revision The revision to touch up. Defaults to @ if neither --to nor --from are specified --from Show changes from this revision. Defaults to @ if --to is specified --to Edit changes in this revision. Defaults to @ if --from is specified -h, --help Print help (see more with '--help')