結果 : git undo merge before commit