Split changes and insertions on consecutive lines

Currently if a change is immediately followed by an insertion on the next line, both change and insertion are highlighted as change. I tried to fix it myself, but unfortunately this breaks highlighting changes as they are displayed as insertion instead of changes. Perhaps you can take a look?