checkout: prevent losing staged changes with --merge
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: 6eff409e8a76)
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 34876 t7900-subtree.sh