xdiff: fix merging of hunks with -W context and -u context