rerere: recalculate conflict ID when unresolved conflict is committed
[gitweb.git] / t / t4051 /
drwxr-xr-x   parent (dest: t; base: bd7dfa543e0263858071b8648a55ef7ccae1085b)
-rw-r--r-- 224 appended1.c
-rw-r--r-- 1385 appended2.c
-rw-r--r-- 88 dummy.c
-rw-r--r-- 334 hello.c
-rw-r--r-- 407 includes.c