cherry-pick/revert: add scissors line on merge conflict
[gitweb.git] / t / t5000 /
drwxr-xr-x   parent (dest: t; base: 1a2b985fb375e7ce14932bfc59365024af2fb6ab)
-rw-r--r-- 2048 19f9c8273ec45a8938e6999cb59b3ff66739902a
-rw-r--r-- 2048 huge-and-future.tar
-rw-r--r-- 10240 pax.tar