[commit: ghc] ghc-7.10: Fix merge-o in testsuite output that I missed (5753910)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/5753910079649a6b6d0e004c0ccb1c3ed0676289/ghc

>---------------------------------------------------------------

commit 5753910079649a6b6d0e004c0ccb1c3ed0676289
Author: Austin Seipp <austin at well-typed.com>
Date:   Mon May 11 06:03:43 2015 -0500

    Fix merge-o in testsuite output that I missed
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

5753910079649a6b6d0e004c0ccb1c3ed0676289
 testsuite/tests/ghci/scripts/T8485.stderr           |  2 +-
 testsuite/tests/typecheck/should_fail/T10285.stderr | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/testsuite/tests/ghci/scripts/T8485.stderr b/testsuite/tests/ghci/scripts/T8485.stderr
index bbef720..5edf696 100644
--- a/testsuite/tests/ghci/scripts/T8485.stderr
+++ b/testsuite/tests/ghci/scripts/T8485.stderr
@@ -1,4 +1,4 @@
 
-<interactive>:3:11: error:
+<interactive>:3:11:
     The role annotation for ‘X’ lacks an accompanying binding
       (The role annotation must be given where ‘X’ is declared)
diff --git a/testsuite/tests/typecheck/should_fail/T10285.stderr b/testsuite/tests/typecheck/should_fail/T10285.stderr
index b56f124..47cfbec 100644
--- a/testsuite/tests/typecheck/should_fail/T10285.stderr
+++ b/testsuite/tests/typecheck/should_fail/T10285.stderr
@@ -1,18 +1,18 @@
 
-T10285.hs:8:17: error:
-    Could not deduce: a ~ b
-    from the context: Coercible (N a) (N b)
-      bound by a pattern with constructor:
+T10285.hs:8:17:
+    Could not deduce (a ~ b)
+    from the context (Coercible (N a) (N b))
+      bound by a pattern with constructor
                  Coercion :: forall (k :: BOX) (a :: k) (b :: k).
                              Coercible a b =>
                              Coercion a b,
                in an equation for ‘oops’
       at T10285.hs:8:6-13
       ‘a’ is a rigid type variable bound by
-          the type signature for: oops :: Coercion (N a) (N b) -> a -> b
+          the type signature for oops :: Coercion (N a) (N b) -> a -> b
           at T10285.hs:7:9
       ‘b’ is a rigid type variable bound by
-          the type signature for: oops :: Coercion (N a) (N b) -> a -> b
+          the type signature for oops :: Coercion (N a) (N b) -> a -> b
           at T10285.hs:7:9
     Relevant bindings include
       oops :: Coercion (N a) (N b) -> a -> b (bound at T10285.hs:8:1)