t6036: add a failed conflict detection case with submodule modify/modify
[gitweb.git] / t / diff-lib /
drwxr-xr-x   parent (dest: t; base: d4d17180808437fd732a9d14388657b8f609ad4a)
-rw-r--r-- 18787 COPYING
-rw-r--r-- 2163 README