Use Daniel's read-tree in the merge strategy 'resolve'.

diff --git a/csum-file.h b/csum-file.h
index 2b6c8dcad25c29ddd13742e9904c54b97286bc0a..3ad1a992a758fc9339baa2cecc17ac14af359f1b 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -10,7 +10,8 @@ struct sha1file {
        unsigned char buffer[8192];
 };
 
-extern struct sha1file *sha1create(const char *fmt, ...);
+extern struct sha1file *sha1fd(int fd, const char *name);
+extern struct sha1file *sha1create(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
 extern int sha1close(struct sha1file *, unsigned char *, int);
 extern int sha1write(struct sha1file *, void *, unsigned int);
 extern int sha1write_compressed(struct sha1file *, void *, unsigned int);