merge script: tweak unmerged files message to match builtin
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: 64048d670b4810125493ff0a2bab88cb12344e7f)
-rw-r--r-- 8584 sha1.c
-rw-r--r-- 692 sha1.h