Ours section on the wrong line #23
Description
I have a very simple merge conflict that looks like this:
<<<<<<< HEAD
=======
// allowBridgeConnections = false,
>>>>>>> origin/bridges
The ours section (HEAD) is empty, and the theirs section (origin/bridges) has just 1 line in it.
The ec GUI looks like this
On the left-hand panel (ours panel), it's showing the selected hunk at line 56, which is way off from where the conflict actually is.
If I scroll waaaay down to line 920 on the ours panel, I see this
So it looks like the panels are kind of out of sync in terms of scrolling.