結果 : git undo a merge before commit