Surface repos stuck in a long-lived merge state

[Will-Howard]

With -M, a cycle skips committing while a merge is in progress. We should surface this in status and the Mac menu bar so the user can notice