projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 417fa55)
Fix conflict with stacktrace.out.
authorGeoffrey Keating <geoffk@gcc.gnu.org>
Fri, 7 Jul 2006 18:49:03 +0000 (18:49 +0000)
committerGeoffrey Keating <geoffk@gcc.gnu.org>
Fri, 7 Jul 2006 18:49:03 +0000 (18:49 +0000)
From-SVN: r115266

libjava/testsuite/libjava.lang/StackTrace.out [deleted file] patch | blob | history
libjava/testsuite/libjava.lang/StackTrace2.out [new file with mode: 0644] patch | blob

diff --git a/libjava/testsuite/libjava.lang/StackTrace.out b/libjava/testsuite/libjava.lang/StackTrace.out
deleted file mode 100644 (file)
index 417d471..0000000
--- a/libjava/testsuite/libjava.lang/StackTrace.out
+++ /dev/null
@@ -1,5 +0,0 @@
-Trace length = 4
-StackTrace$Inner.doCrash:OK
-StackTrace$Inner.<init>:OK
-StackTrace.a:OK
-StackTrace.main:OK
diff --git a/libjava/testsuite/libjava.lang/StackTrace2.out b/libjava/testsuite/libjava.lang/StackTrace2.out
new file mode 100644 (file)
index 0000000..417d471
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/StackTrace2.out
@@ -0,0 +1,5 @@
+Trace length = 4
+StackTrace$Inner.doCrash:OK
+StackTrace$Inner.<init>:OK
+StackTrace.a:OK
+StackTrace.main:OK