From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Dec 2010 19:27:13 +0000 (-0800)
Subject: Merge branch 'cb/maint-orphan-merge-noclobber' into maint
X-Git-Tag: v1.7.3.3~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47f16e8b110d84bacb586a1b7183ee4bb781c980;p=thirdparty%2Fgit.git

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

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

47f16e8b110d84bacb586a1b7183ee4bb781c980