merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / t / t4034 / ada /
drwxr-xr-x   parent (dest: t/t4034; base: febb3a86098f853066c2623c2392f156710dd40f)
-rw-r--r-- 1168 expect
-rw-r--r-- 148 post
-rw-r--r-- 149 pre