結果 : git undo local merge without commit