merge-tool documentation: describe custom command usage

diff --git a/csum-file.h b/csum-file.h
index 4d1b231292ad4cfc7996b73ea31fa74a5eff2687..1af76562f31da89e4cd2592079edb9c6a45736e3 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -5,11 +5,12 @@ struct progress;
 
 /* A SHA1-protected file */
 struct sha1file {
-       int fd, error;
-       unsigned int offset, namelen;
+       int fd;
+       unsigned int offset;
        SHA_CTX ctx;
+       off_t total;
        struct progress *tp;
-       char name[PATH_MAX];
+       const char *name;
        int do_crc;
        uint32_t crc32;
        unsigned char buffer[8192];