diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-04-08 05:03:43 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-04-08 05:03:43 +0000 |
| commit | 5f2f32bd7876fbc6e4942ada5855275e16986784 (patch) | |
| tree | 90b0a3f952773a366615caee438b31a4c4b2ff04 | |
| parent | 9e02b81e916be9a4c771f95a82259e0b87044f0f (diff) | |
| download | gcc-5f2f32bd7876fbc6e4942ada5855275e16986784.tar.gz | |
Correct merge conflict
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33020 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 f31f1afb0c0..6602129ede9 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. |