Clarify commit error message for unmerged files