Enable output buffering in merge-recursive.

diff --git a/cache.h b/cache.h
index c482c32a03ebc55a293aa96c8add08abf355f2ea..620b6a4ed47b9b94700a7f9bec270aca7efe29db 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -434,7 +434,6 @@ extern char *git_log_output_encoding;
 
 extern int copy_fd(int ifd, int ofd);
 extern int read_in_full(int fd, void *buf, size_t count);
-extern void read_or_die(int fd, void *buf, size_t count);
 extern int write_in_full(int fd, const void *buf, size_t count);
 extern void write_or_die(int fd, const void *buf, size_t count);
 extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg);