OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove conflict markers 

From-SVN: r107214
This commit is contained in:
Hans-Peter Nilsson 2005-11-19 08:35:22 +00:00
parent 4801f7ed6f
commit 8273ee9f13
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/testsuite/ChangeLog
View File

@ -1,15 +1,12 @@
<<<<<<< .mine
2005-11-18 Mark Mitchell <mark@codesourcery.com>
PR c++/8355
* g++.dg/template/friend39.C: New test.
=======
2005-11-18 James E Wilson <wilson@specifix.com>
* gcc.dg/builtin-strstr.c: New.
>>>>>>> .r107206
2005-11-18 Richard Henderson <rth@redhat.com>
* gcc.target/ia64/20010423-1.c, gcc.target/ia64/20020313-1.c,