merge script: handle --no-ff --no-commit correctly
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: 2a70fa4f1e377bc68bcabdc1a550e9970acccda7)
-rw-r--r-- 8584 sha1.c
-rw-r--r-- 692 sha1.h