t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
[gitweb.git] / t / t4051 /
drwxr-xr-x   parent (dest: t; base: eee73388f25a7a0c61b2200868d93ff8d91b27ca)
-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