![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jan 2009 08:09:27 +0000 (00:09 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jan 2009 08:09:27 +0000 (00:09 -0800) |
* cb/merge-recursive-fix:
merge-recursive: do not clobber untracked working tree garbage
modify/delete conflict resolution overwrites untracked file
merge-recursive: do not clobber untracked working tree garbage
modify/delete conflict resolution overwrites untracked file
Trivial merge