testsuite: fix some failures from merge problems

Signed-off-by: Austin Seipp <austin@well-typed.com>

testsuite/tests/driver/T2507.stderr

 
 T2507.hs:5:7:
-    Couldn't match expected type `Int' with actual type `()'
+    Couldn't match expected type ‘Int’ with actual type ‘()’
     In the expression: ()
-    In an equation for `foo': foo = ()
+    In an equation for ‘foo’: foo = ()

testsuite/tests/ghci/prog013/prog013.stderr

 
-Bad.hs:3:8: error:
+Bad.hs:3:8:
     lexical error in string/character literal at character '\n'
 
-Bad.hs:3:8: error:
+Bad.hs:3:8:
     lexical error in string/character literal at character '\n'
 
-Bad.hs:3:8: error:
+Bad.hs:3:8:
     lexical error in string/character literal at character '\n'
 
-<interactive>:10:1: error: parse error on input ‘+’
+<interactive>:10:1: parse error on input ‘+’
 
-Bad.hs:3:8: error:
+Bad.hs:3:8:
     lexical error in string/character literal at character '\n'
 
-Bad.hs:3:8: error:
+Bad.hs:3:8:
     lexical error in string/character literal at character '\n'

testsuite/tests/simplCore/should_compile/T4945.stdout

-                               -> STUArray RealWorld Int Int -> (# State# RealWorld, () #)
+                               -> STUArray RealWorld Int Int
                               (ipv3 [OS=OneShot] :: STUArray RealWorld Int Int) ->
                                           case ipv3 of _ [Occ=Dead] { STUArray ds5 ds6 dt ds7 ->
                                   (Data.Array.Base.STUArray
-                                          (Data.Array.Base.STUArray
-                                          (Data.Array.Base.STUArray
                                   (Data.Array.Base.STUArray
-                                          (Data.Array.Base.STUArray
-                                          (Data.Array.Base.STUArray
+                                  (Data.Array.Base.STUArray
+                                  (Data.Array.Base.STUArray