merge-recursive: avoid incorporating uncommitted changes in a merge
[gitweb.git] / t / t4034 / css /
drwxr-xr-x   parent (dest: t/t4034; base: 65170c07d4)
-rw-r--r-- 571 expect
-rw-r--r-- 150 post
-rw-r--r-- 164 pre