t / t5100 / msg0006on commit Merge branch 'jc/combine-diff-many-parents' (4dd7c77)
   1Here is a patch from A U Thor.
   2