Andrew's git / gitweb.git / diff
?
Merge branch 'cb/maint-merge-recursive-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 09:13:56 +0000 (01:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 09:13:56 +0000 (01:13 -0800)
* cb/maint-merge-recursive-fix:
merge-recursive: do not clobber untracked working tree garbage
modify/delete conflict resolution overwrites untracked file

Conflicts:
builtin-merge-recursive.c

No differences found