[clang-tools-extra] r375058 - [lit] Fix another test case that r374652 missed

[Joel E. Denny via cfe-commits]

Author: jdenny
Date: Wed Oct 16 16:58:58 2019
New Revision: 375058

URL: http://llvm.org/viewvc/llvm-project?rev=375058&view=rev
Log:
[lit] Fix another test case that r374652 missed

Modified:
    clang-tools-extra/trunk/test/clang-include-fixer/merge.test

Modified: clang-tools-extra/trunk/test/clang-include-fixer/merge.test
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-include-fixer/merge.test?rev=375058&r1=375057&r2=375058&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/clang-include-fixer/merge.test (original)
+++ clang-tools-extra/trunk/test/clang-include-fixer/merge.test Wed Oct 16 16:58:58 2019
@@ -1,6 +1,6 @@
 # RUN: find-all-symbols -merge-dir=%S/Inputs/merge %t.merged
 # RUN: sed '/^#/d' %s > %t.golden
-# RUN: diff -u %t.golden %t.merged
+# RUN: diff --strip-trailing-cr -u %t.golden %t.merged
 ---
 Name:            bar
 Contexts: