[Git][ghc/ghc][wip/marge_bot_batch_merge_job] Fix merge conflict in T18355.stderr

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
18b8c177 by Krzysztof Gogolewski at 2022-11-12T04:24:36-05:00
Fix merge conflict in T18355.stderr

Fixes #22446

- - - - -


1 changed file:

- testsuite/tests/simplCore/should_compile/T18355.stderr


Changes:

=====================================
testsuite/tests/simplCore/should_compile/T18355.stderr
=====================================
@@ -7,16 +7,8 @@ Result size of Tidy Core
 f :: forall {a}. Num a => a -> Bool -> a -> a
 [GblId,
  Arity=4,
-<<<<<<< HEAD
- Str=<1P(MC1(C1(L)),MC1(C1(L)),A,A,A,A,A)><L><1L><L>,
+ Str=<1P(MC(1,C(1,L)),MC(1,C(1,L)),A,A,A,A,A)><L><1L><L>,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
-||||||| parent of 75ae893f7c (Demand: Format Call SubDemands `Cn(sd)` as `C(n,sd)` (#22231))
- Str=<S,1*U(1*C1(C1(U)),1*C1(C1(U)),A,A,A,A,A)><L,U><S,1*U><L,U>,
- Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
-=======
- Str=<S,1*U(1*C(1,C(1,U)),1*C(1,C(1,U)),A,A,A,A,A)><L,U><S,1*U><L,U>,
- Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
->>>>>>> 75ae893f7c (Demand: Format Call SubDemands `Cn(sd)` as `C(n,sd)` (#22231))
          WorkFree=True, Expandable=True,
          Guidance=IF_ARGS [60 0 70 0] 100 0}]
 f = \ (@a)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/18b8c1777766bd44d29874ac46a27c96137f2dea

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/18b8c1777766bd44d29874ac46a27c96137f2dea
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221112/535140c9/attachment-0001.html>