Merge branch 'jc/read-tree-safety'
authorJunio C Hamano <junkio@cox.net>
Sat, 20 May 2006 00:02:22 +0000 (17:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 20 May 2006 00:02:22 +0000 (17:02 -0700)
* jc/read-tree-safety:
  read-tree -m -u: do not overwrite or remove untracked working tree files.


Trivial merge