projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c690ca)
Remove >>> conflict indicator.
authorJeff Law <law@gcc.gnu.org>
Tue, 14 Dec 2004 17:46:11 +0000 (10:46 -0700)
committerJeff Law <law@gcc.gnu.org>
Tue, 14 Dec 2004 17:46:11 +0000 (10:46 -0700)
From-SVN: r92148

gcc/testsuite/ChangeLog patch | blob | history

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9a15271da22d69685c76edea72f7955cbea4171a..18420bfae81a4c47f94223aca7c61e241594c707 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -71,7 +71,6 @@
        PR middle-end/18903
        * gcc.c-torture/compile/pr18903.c: New test.
 
->>>>>>> 1.4750
 2004-12-10  Richard Sandiford  <rsandifo@redhat.com>
 
        * gcc.c-torture/execute/20041210-1.c: New test.