Andrew's git / gitweb.git / diff
?
Merge branch 'cb/merge-recursive-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 08:09:27 +0000 (00:09 -0800)
committerJunio 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

Trivial merge