projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3facde2)
Correct merge conflict
authorNeil Booth <neil@gcc.gnu.org>
Sat, 8 Apr 2000 05:03:43 +0000 (05:03 +0000)
committerNeil Booth <neil@gcc.gnu.org>
Sat, 8 Apr 2000 05:03:43 +0000 (05:03 +0000)
From-SVN: r33020

gcc/testsuite/ChangeLog patch | blob | history

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f31f1afb0c0b8ed4b22c9ab3e14a27977f862bf5..6602129ede984b07613b051e8b2eb973e4aaf2f4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-08  Neil Booth  <NeilB@earthling.net>
+       
+       * gcc.dg/cpp-nullchar.c: Remove test as
+       embedded nulls cause problems.
+
 2000-04-08  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * gcc.dg/compare2.c: New test.