結果 : git undo merge after commit