merge-recursive: avoid clobbering untracked files with directory renames
[gitweb.git] / t / t5000 /
drwxr-xr-x   parent (dest: t; base: 79c47598f5c8c0008ae9281f20c2a041d4cabd93)
-rw-r--r-- 2048 19f9c8273ec45a8938e6999cb59b3ff66739902a
-rw-r--r-- 2048 huge-and-future.tar
-rw-r--r-- 10240 pax.tar