Merge branch 'jc/checkout-from-tree-keep-local-changes'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:09 +0000 (21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:09 +0000 (21:37 -0700)
* jc/checkout-from-tree-keep-local-changes:
  checkout $tree $path: do not clobber local changes in $path not in $tree

1  2 
builtin/checkout.c

Simple merge