[Diff] Fix #2614.

Added hunk overlapping in Unified Diff.