diff --git a/cli/src/commands/squash.rs b/cli/src/commands/squash.rs index a9e2677d42..7944665243 100644 --- a/cli/src/commands/squash.rs +++ b/cli/src/commands/squash.rs @@ -48,7 +48,7 @@ use crate::ui::Ui; /// parent(s), and `--keep-emptied` is not set, it will be abandoned. Without /// `--interactive` or paths, the source revision will always be empty. /// -/// If the source became empty and both the source and destination had a +/// If the source was abandoned and both the source and destination had a /// non-empty description, you will be asked for the combined description. If /// either was empty, then the other one will be used. /// diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap index e8c52c6525..fd1c525cda 100644 --- a/cli/tests/cli-reference@.md.snap +++ b/cli/tests/cli-reference@.md.snap @@ -1906,7 +1906,7 @@ With the `--from` and/or `--into` options, moves changes from/to the given revis If, after moving changes out, the source revision is empty compared to its parent(s), and `--keep-emptied` is not set, it will be abandoned. Without `--interactive` or paths, the source revision will always be empty. -If the source became empty and both the source and destination had a non-empty description, you will be asked for the combined description. If either was empty, then the other one will be used. +If the source was abandoned and both the source and destination had a non-empty description, you will be asked for the combined description. If either was empty, then the other one will be used. If a working-copy commit gets abandoned, it will be given a new, empty commit. This is true in general; it is not specific to this command.