Fix rebasing over merge commits

[mark2185]

• PR Description

This should fix #2160 .

• Please check if the PR fulfills these requirements

• [x] Cheatsheets are up-to-date (run go run scripts/cheatsheet/main.go generate)
• [x] Code has been formatted (see here)
• [x] Tests have been added/updated (see here for the integration test guide)
• [x] Text is internationalised (see here)
• [x] Docs (specifically docs/Config.md) have been updated if necessary
• [x] You've read through your own file changes for silly mistakes etc

[jesseduffield]

hmm does that test also fail locally?

[mark2185]

hmm does that test also fail locally?

Not for me. Let's see if a rebase fixes it.

[jesseduffield]

Nice work