From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 23:55:36 +0000 (-0800)
Subject: Merge branch 'cb/maint-orphan-merge-noclobber'
X-Git-Tag: v1.7.4-rc0~117
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d43de925b2771d295d8fc4341b7bd544e2a74fa;p=git.git

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

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

7d43de925b2771d295d8fc4341b7bd544e2a74fa