checkout: prevent losing staged changes with --merge
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: 6eff409e8a76)
-rw-r--r-- 116 diff.NUL