mismerge
mismerge copied to clipboard
FR: Keyboard shortcuts for going to next/previous diff while editing the text
They might exist already, but I didn't immediately find them.