Collapse surrounding unchanged diff lines

When decoding the diff JSON, collapse groups of unchanged diff lines that are
further than 3 lines away from a changed diff line.

Also improve how line numbers are added to each line in the diff and how
spacers are merged.

Author: hojberg