t / t5100 / msg0007on commit Merge branch 'da/maint-mergetool-twoway' into maint (38ca63f)
   1Here is an empty patch from A U Thor.
   2