merge-recursive: fix overwriting dirty files involved in renames
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: e0052f4613cd8f586b0b9975fedffce268ca6ce9)
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 35161 t7900-subtree.sh