Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

Remi Galan Alfonso [off-list ref]
writes:

Either way (3 or 4 lines) I find it strange to have both advices
start in the same way except that one is split and not the other.

True.