aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorH.J. Lu <hjl@gcc.gnu.org>2007-10-30 10:54:29 -0700
committerH.J. Lu <hjl@gcc.gnu.org>2007-10-30 10:54:29 -0700
commit26796ffd3bb08b9c0b4fd6b99e8da56b4bc9aa1d (patch)
tree16931e87ab66130b2d5b033d775ad7c19a1e6e0c /gcc
parent9c6fc6c6e51147ebeb7a2a56591c4d60f54b181e (diff)
downloadgcc-26796ffd3bb08b9c0b4fd6b99e8da56b4bc9aa1d.zip
gcc-26796ffd3bb08b9c0b4fd6b99e8da56b4bc9aa1d.tar.gz
gcc-26796ffd3bb08b9c0b4fd6b99e8da56b4bc9aa1d.tar.bz2
Remove ">>>>>>> .r129772".
From-SVN: r129777
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0956218..9e385c4 100644
--- 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.