t / t5100 / msg0001on commit Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' (4ed3863)
   1Here is a patch from A U Thor.
   2