checkout: prevent losing staged changes with --merge
[gitweb.git] / t / t0021 /
drwxr-xr-x   parent (dest: t; base: 6eff409e8a76)
-rw-r--r-- 7048 rot13-filter.pl