Merge branch 'cb/maint-orphan-merge-noclobber'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 23:55:36 +0000 (15:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 23:55:36 +0000 (15:55 -0800)
commit7d43de925b2771d295d8fc4341b7bd544e2a74fa
tree06cd429ed1ed04337eeaf23f6d72855fd94d3c0b
parent01530432f73e7a29fbb9c4bc62aa88fba125ca7d
parent172b6428d06ff4eb0812f087a497d50b6c878fe1
Merge branch 'cb/maint-orphan-merge-noclobber'

* cb/maint-orphan-merge-noclobber:
  do not overwrite untracked during merge from unborn branch
builtin/merge.c
t/t7607-merge-overwrite.sh