checkout: prevent losing staged changes with --merge
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: 6eff409e8a760645ae5357d1e95e7e7ff3c04456)
-rw-r--r-- 7534 sha1.c
-rw-r--r-- 712 sha1.h