merge-recursive: avoid clobbering untracked files with directory renames
[gitweb.git] / t / t7505 /
drwxr-xr-x   parent (dest: t; base: 79c47598f5c8c0008ae9281f20c2a041d4cabd93)
-rw-r--r-- 535 expected-rebase-i
-rw-r--r-- 570 expected-rebase-p