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