Allow diffs to be created from overlapping hunks

[fix #228][fix #225]