t / t5100 / msg0006on commit Merge branch 'mk/combine-diff-context-horizon-fix' (edc7f0a)
   1Here is a patch from A U Thor.
   2