関連ワード:  git abort merge changes    git undo merge changes    git abort merge keep changes    git abort merge but keep changes    git abort merge without losing changes    git undo merge keep changes    git abort merge and reset    git abort current merge