Make sure the empty tree exists when needed in merge-recursive.

diff --git a/strbuf.h b/strbuf.h
index da678e506fcb6219f73d07982b057192cb30beb3..74cc012c2c62d05cb773c6dd4776af0fdc237dfb 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -4,7 +4,7 @@ struct strbuf {
        int alloc;
        int len;
        int eof;
-       unsigned char *buf;
+       char *buf;
 };
 
 extern void strbuf_init(struct strbuf *);