git merge的撤销

NoSuchKey