結果 : undo local merge commit git