merge-recursive: avoid clobbering untracked files with directory renames