merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: febb3a86098f853066c2623c2392f156710dd40f)
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 35161 t7900-subtree.sh