Here's a tricky diff situation I haven't seen before: a minimal text diff can be ugly. It would be nicer to match line 6 on the left with line 3 on the right, so the removed region is contiguous. (git-diff handles this case nicely already.)