![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Dec 2008 03:40:09 +0000 (19:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Dec 2008 10:39:57 +0000 (02:39 -0800) | ||
| commit | c5ab03f26c992e30f355fba129f70db0f290fcd7 | |
| tree | 799ffb275675e682cc9b4375eddd7c0e70139187 | tree | snapshot |
| parent | 7bb1fcc6fcc5a2d0164f243fd10f346eb0822ddf | commit | diff |
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>
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>
| builtin-merge-recursive.c | diff | blob | history | |
| t/t7607-merge-overwrite.sh | diff | blob | history |