[Diff] Fix #2614.
Added hunk overlapping in Unified Diff.
Fixed weird bug.
It seems that the diff enumerable had a sentinel element.
Naming fix.
Reverted.
Merge pull request #280 from Therzok/udiffContext

[Diff] Fix #2614.