Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint
* jc/checkout-from-tree-keep-local-changes: checkout $tree $path: do not clobber local changes in $path not in $tree
Junio C Hamano committed
Oct 21, 2011 at 10:49 UTC
df6840855d24c2f54c0b8a66cbac33d8af43333a
No changes.