projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c6fc6c)
Remove ">>>>>>> .r129772".
authorH.J. Lu <hjl@gcc.gnu.org>
Tue, 30 Oct 2007 17:54:29 +0000 (10:54 -0700)
committerH.J. Lu <hjl@gcc.gnu.org>
Tue, 30 Oct 2007 17:54:29 +0000 (10:54 -0700)
From-SVN: r129777

gcc/testsuite/ChangeLog patch | blob | history

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0956218a9817d711c61f559e89c24af250b1e182..9e385c4511f33a86ce0f5d7fdf9a403b917970d3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -15,7 +15,6 @@
        * gcc.c-torture/execute/20071030-1.c: New testcase copied from
        gcc.target/i386/loop-3.c.
 
->>>>>>> .r129772
 2007-10-30  Revital Eres  <eres@il.ibm.com>
 
        * testsuite/gcc.dg/vect/pr33866.c: Require vect_long.