t / t5100 / msg0006on commit Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint (df68408)
   1Here is a patch from A U Thor.
   2