rerere: recalculate conflict ID when unresolved conflict is committed
[gitweb.git] / t / t5000 /
drwxr-xr-x   parent (dest: t; base: bd7dfa543e0263858071b8648a55ef7ccae1085b)
-rw-r--r-- 2048 19f9c8273ec45a8938e6999cb59b3ff66739902a
-rw-r--r-- 2048 huge-and-future.tar
-rw-r--r-- 10240 pax.tar