![[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) | ||
| commit | a19528c9fd85454204ff76cd58923072c83594b1 | |
| tree | 3f88886a5eac7538098dcf5cca3b53e7148ab006 | tree | snapshot |
| parent | 960e0eb3eae8d1a5db754ebe44c0ccb414b855ad | commit | diff |
| parent | 60c91181faf33316211970cd2f332b39acb48399 | commit | diff |
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
* cb/merge-recursive-fix:
merge-recursive: do not clobber untracked working tree garbage
modify/delete conflict resolution overwrites untracked file