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