Merge branch 'rs/xdiff-hunk-with-func-line'