Allow the user to control the verbosity of merge-recursive.

diff --git a/pkt-line.h b/pkt-line.h
index b0b4f6d495e06cfe797a9c8dfba38d61804e6c81..9df653f6f5afe720870658d7093bddbf3e66beaf 100644 (file)
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -1,12 +1,15 @@
 #ifndef PKTLINE_H
 #define PKTLINE_H
 
+#include "git-compat-util.h"
+
 /*
  * Silly packetized line writing interface
  */
 void packet_flush(int fd);
-void packet_write(int fd, const char *fmt, ...);
+void packet_write(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
 
 int packet_read_line(int fd, char *buffer, unsigned size);
+ssize_t safe_write(int, const void *, ssize_t);
 
 #endif