Fixed a case where a commit could be lost when pushing a merge.