git-merge-ours: make sure our index matches HEAD