From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Jan 2009 08:09:27 +0000 (-0800)
Subject: Merge branch 'cb/merge-recursive-fix'
X-Git-Tag: v1.6.2-rc0~186
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a19528c9fd85454204ff76cd58923072c83594b1;p=git.git

Merge branch 'cb/merge-recursive-fix'

* cb/merge-recursive-fix:
  merge-recursive: do not clobber untracked working tree garbage
  modify/delete conflict resolution overwrites untracked file
---

a19528c9fd85454204ff76cd58923072c83594b1