From: Julia Evans <julia@jvns.ca>

During a merge conflict, we suggest using --continue to continue the
merge for rebase, revert, and cherry-pick.

Change the `git merge` advice to be consistent. 367ff69428
(merge: add '--continue' option as a synonym for 'git commit', 2016-12-14)
says that `git merge --continue` is intended to be a synonym for
`git commit`, and the `git merge` man page already suggests to use
`git merge --continue`.

Signed-off-by: Julia Evans <julia@jvns.ca>

Submitted-As: https://lore.kernel.org/git/pull.2249.v3.git.1791558823445.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.2249.git.1791291762665.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.2249.v2.git.1791551486318.gitgitgadget@gmail.com