diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2022-11-10 23:29:15 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-11-12 08:05:28 -0500 |
| commit | e160cf4776f21a39adebfa8f5d4dcbe9ec6b0ffe (patch) | |
| tree | 14f22e1f86f757172239b8c80b26b5a13b1a0414 /testsuite | |
| parent | 360f5fec2eb430ac15145193d95120a5a6ca6812 (diff) | |
| download | haskell-e160cf4776f21a39adebfa8f5d4dcbe9ec6b0ffe.tar.gz | |
Fix merge conflict in T18355.stderr
Fixes #22446
Diffstat (limited to 'testsuite')
| -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) |