Merge branch 'cb/maint-orphan-merge-noclobber' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 19:27:13 +0000 (2 11:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 19:27:13 +0000 (2 11:27 -0800)
* cb/maint-orphan-merge-noclobber:
  do not overwrite untracked during merge from unborn branch

1  2 
builtin/merge.c
t/t7607-merge-overwrite.sh

diff --cc builtin/merge.c
Simple merge
Simple merge