git-am --resolved: more usable error message.