This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
gcc/testsuite/ChangeLog conflict markers removed
- From: Hans-Peter Nilsson <hp at bitrange dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Sat, 19 Nov 2005 03:38:03 -0500 (EST)
- Subject: gcc/testsuite/ChangeLog conflict markers removed
Index: ChangeLog
===================================================================
--- ChangeLog (revision 107213)
+++ ChangeLog (working copy)
@@ -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,
brgds, H-P