diff options
| author | Neil Booth <neil@gcc.gnu.org> | 2000-04-08 05:03:43 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2000-04-08 05:03:43 +0000 |
| commit | ed343779f43f00bfe1196e37ece5878eaf58af2e (patch) | |
| tree | 90b0a3f952773a366615caee438b31a4c4b2ff04 /gcc | |
| parent | 3facde269a04c33b91becb5cf4397fb69077895d (diff) | |
| download | gcc-ed343779f43f00bfe1196e37ece5878eaf58af2e.zip gcc-ed343779f43f00bfe1196e37ece5878eaf58af2e.tar.gz gcc-ed343779f43f00bfe1196e37ece5878eaf58af2e.tar.bz2 | |
Correct merge conflict
From-SVN: r33020
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f31f1af..6602129 100644 --- 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. |