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 (moved).

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 added
• Documentation created/updated
• API support added
• Tests
  • Added for this feature/bug
  • All builds are passing
• Conform by the merge request performance guides
• Conform by the style guides
• Branch has no merge conflicts with master (if it does - rebase it please)
• Squashed related commits together

What are the relevant issue numbers?

Originally a part of #21812 (moved) Closes #25429 (closed)