r228105 - Add missing file from r228104.

[Richard Smith]

Author: rsmith
Date: Tue Feb  3 19:51:12 2015
New Revision: 228105

URL: http://llvm.org/viewvc/llvm-project?rev=228105&view=rev
Log:
Add missing file from r228104.

Added:
    cfe/trunk/test/Modules/Inputs/merge-template-members/merge.h

Added: cfe/trunk/test/Modules/Inputs/merge-template-members/merge.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/merge-template-members/merge.h?rev=228105&view=auto
==============================================================================
--- cfe/trunk/test/Modules/Inputs/merge-template-members/merge.h (added)
+++ cfe/trunk/test/Modules/Inputs/merge-template-members/merge.h Tue Feb  3 19:51:12 2015
@@ -0,0 +1,2 @@
+#include "b1.h"
+#include "b2.h"