git-merge: squelch needless error message.