Merge branch '25429-fix-awkward-wording-in-cherry-pick-and-revert-errors' into 'master'

Resolve "Fix awkward wording in "cherry-pick" and "revert" errors."

## What does this MR do?

Fixes a poorly worded error message as well as some other minor bugs I encountered while investigating #21812.

## Are there points in the code the reviewer needs to double check?

Should be pretty straight forward.

## Why was this MR needed?

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added~~
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- Tests
  - [ ] ~~Added for this feature/bug~~
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Originally a part of #21812
Closes #25429

See merge request !7981

0 files changed, 0 insertions, 0 deletions