merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / t / t5000 /
drwxr-xr-x   parent (dest: t; base: 6e7e027fe5f4a8d61597a86e7f2b6087e23a759c)
-rw-r--r-- 2048 19f9c8273ec45a8938e6999cb59b3ff66739902a
-rw-r--r-- 2048 huge-and-future.tar
-rw-r--r-- 10240 pax.tar