tree 06cd429ed1ed04337eeaf23f6d72855fd94d3c0b
parent 01530432f73e7a29fbb9c4bc62aa88fba125ca7d
parent 172b6428d06ff4eb0812f087a497d50b6c878fe1
author Junio C Hamano <gitster@pobox.com> 1290642936 -0800
committer Junio C Hamano <gitster@pobox.com> 1290642936 -0800

Merge branch 'cb/maint-orphan-merge-noclobber'

* cb/maint-orphan-merge-noclobber:
  do not overwrite untracked during merge from unborn branch