projects
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
221c7a7
)
Remove conflict marker.
author
Kriang Lerdsuwanakij
<lerdsuwa@gcc.gnu.org>
Sat, 16 Dec 2000 08:16:09 +0000
(08:16 +0000)
committer
Kriang Lerdsuwanakij
<lerdsuwa@gcc.gnu.org>
Sat, 16 Dec 2000 08:16:09 +0000
(08:16 +0000)
From-SVN: r38303
gcc/testsuite/ChangeLog
patch
|
blob
|
history
diff --git
a/gcc/testsuite/ChangeLog
b/gcc/testsuite/ChangeLog
index 88fbe054d00976670ccca13de3ad5bf2761586fe..c28b22e48d36c7cb22edee86a75799d040a0c8af 100644
(file)
--- a/
gcc/testsuite/ChangeLog
+++ b/
gcc/testsuite/ChangeLog
@@
-57,7
+57,6
@@
* gcc.dg/cpp/redef2.c: Update.
* gcc.dg/cpp/skipping.c: New test.
->>>>>>> 1.929
2000-12-07 Geoffrey Keating <geoffk@redhat.com>
* g++.old-deja/g++.other/eh3.C: New testcase.