Merge branch 'jc/checkout-from-tree-keep-local-changes'
* 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 17, 2011 at 21:37 UTC
66d2c22f416cda652f08e8db5820abf3e87592e5
No changes.