Use %select to merge two diagnostics that only differ in one word and are...

Use %select to merge two diagnostics that only differ in one word and are emitted in the same place. NFC

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@252861 91177308-0d34-0410-b5e6-96231b3b80d8