Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint
[git] / t / t5100 / patch0008