merge: clarify collect_parents() logic
[gitweb.git] / t / t4034 / ada /
drwxr-xr-x   parent (dest: t/t4034; base: 0b10b8a3d53c7aaf42b8f14da1021ea59ea4e0ec)
-rw-r--r-- 1168 expect
-rw-r--r-- 148 post
-rw-r--r-- 149 pre