Andrew's git / gitweb.git / diff
?
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)
* cb/maint-orphan-merge-noclobber:
do not overwrite untracked during merge from unborn branch

No differences found