t4150: am --resolved fails if index has unmerged entries