merge-recursive: apply necessary modifications for directory renames
[gitweb.git] / t / t4034 / ada /
drwxr-xr-x   parent (dest: t/t4034; base: 9c0743fe1e45b3a0ffe166ac949a27f95a3e5c34)
-rw-r--r-- 1168 expect
-rw-r--r-- 148 post
-rw-r--r-- 149 pre