Commit64d953d

authored

Fix merge race (#20412)

1 parent007d6de commit64d953dCopy full SHA for 64d953d

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1795,7 +1795,7 @@ def test1(x: Literal[1,2,3]) -> None:`
`1795`	`1795`	`case 1:`
`1796`	`1796`	`reveal_type(x) # N: Revealed type is "Literal[1]"`
`1797`	`1797`	`case other:`
`1798`		`- reveal_type(x) # N: Revealed type is "Union[Literal[2],Literal[3]]"`
	`1798`	`+ reveal_type(x) # N: Revealed type is "Literal[2] \|Literal[3]"`
`1799`	`1799`
`1800`	`1800`	`def test2(x: Literal[1,2,3]) -> None:`
`1801`	`1801`	`match x:`
`@@ -1811,7 +1811,7 @@ def test2(x: Literal[1,2,3]) -> None:`
`1811`	`1811`	`def test3(x: Literal[1,2,3]) -> None:`
`1812`	`1812`	`match x:`
`1813`	`1813`	`case 1 \| 3:`
`1814`		`- reveal_type(x) # N: Revealed type is "Union[Literal[1],Literal[3]]"`
	`1814`	`+ reveal_type(x) # N: Revealed type is "Literal[1] \|Literal[3]"`
`1815`	`1815`	`case other:`
`1816`	`1816`	`reveal_type(x) # N: Revealed type is "Literal[2]"`
`1817`	`1817`

Comments

(0)