Handle really trivial case inside git-merge.