Re: [PATCH] rebase: make resolve message clearer for inexperienced users

William Duclot [off-list ref] writes:

-$(gettext 'When you have resolved this problem, run "git rebase --continue".
-If you prefer to skip this patch, run "git rebase --skip" instead.
-To check out the original branch and stop rebasing, run "git rebase --abort".')
+$(gettext 'Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase -i", run "git rebase --abort".')

This may be my fault, but we do not need to limit this to "reabse
-i"; I'll drop " -i" from this line while queuing.

Thanks.