diff: improve positioning of add/delete blocks in diffs