Accept both / and \\ to fix the windows bots.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@184790 91177308-0d34-0410-b5e6-96231b3b80d8
Check for matching template-parameter-lists when merging template declarations.


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