git-merge: tighten error checking.