Revert "Convert output messages in merge-recursive to past tense."