Merge branch 'cb/maint-orphan-merge-noclobber'
* cb/maint-orphan-merge-noclobber: do not overwrite untracked during merge from unborn branch
Junio C Hamano committed
Nov 24, 2010 at 15:55 UTC
7d43de925b2771d295d8fc4341b7bd544e2a74fa
No changes.