"reset --merge": fix unmerged case