merge-recursive: do not clobber untracked working tree garbage