Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix
commit60c91181faf33316211970cd2f332b39acb48399
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Dec 2008 10:41:24 +0000 (15 02:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Dec 2008 10:41:24 +0000 (15 02:41 -0800)
tree0fa0c871b1b2d94e6852bcf2aaa247b07dbf99af
parent8befc50c49e8a271fd3cd7fb34258fe88d1dfcad
parentc5ab03f26c992e30f355fba129f70db0f290fcd7
Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix

* cb/maint-merge-recursive-fix:
  merge-recursive: do not clobber untracked working tree garbage
  modify/delete conflict resolution overwrites untracked file
merge-recursive.c