Fixing tricky diff alignment issues
Fixing a gnarly bug with multiple adjacent chunks destroying each others context lines.