From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Dec 2008 03:40:09 +0000 (-0800)
Subject: merge-recursive: do not clobber untracked working tree garbage
X-Git-Tag: v1.6.1.1~25^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c5ab03f26c992e30f355fba129f70db0f290fcd7?hp=c5ab03f26c992e30f355fba129f70db0f290fcd7

merge-recursive: do not clobber untracked working tree garbage

When merge-recursive wanted to create a new file in the work tree (either
as the final result, or a hint for reference purposes while delete/modify
conflicts), it unconditionally overwrote an untracked file in the working
tree.  Be careful not to lose whatever the user has that is not tracked.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---