diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2022-11-10 23:29:15 +0100 |
|---|---|---|
| committer | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2022-11-10 23:31:32 +0100 |
| commit | 08cb52348c762c5f4363d3ee9243160e8fc43c58 (patch) | |
| tree | caf05e4fa444102cc55eec05148fd89b65efc407 | |
| parent | 90c5abd4581b404f715e72ad55303e18d0c31d68 (diff) | |
| download | haskell-wip/accept-T18355.tar.gz | |
Fix merge conflict in T18355.stderrwip/accept-T18355
Fixes #22446
| -rw-r--r-- | testsuite/tests/simplCore/should_compile/T18355.stderr | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/testsuite/tests/simplCore/should_compile/T18355.stderr b/testsuite/tests/simplCore/should_compile/T18355.stderr index 62c4e1feec..cb91ec4e59 100644 --- a/testsuite/tests/simplCore/should_compile/T18355.stderr +++ b/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) |