wt-status.c: set commitable bit if there is a meaningful merge.

diff --git a/strbuf.h b/strbuf.h
index 1883494ca3ad4931640c2a295c94800e287c1664..1ea9d0bdeb0980dcaa8670aa43e4ff703fd9d6b8 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -364,7 +364,7 @@ extern ssize_t strbuf_read(struct strbuf *, int fd, size_t hint);
  * Read the contents of a file, specified by its path. The third argument
  * can be used to give a hint about the file size, to avoid reallocs.
  */
-extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
+extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
 
 /**
  * Read the target of a symbolic link, specified by its path.  The third