Fix error message in case of git cherry-pick error