git log: don't do merge diffs by default

diff --git a/pkt-line.h b/pkt-line.h
index b0b4f6d495e06cfe797a9c8dfba38d61804e6c81..51d0cbe219f2f45bf3920441f09dfcc2744adb06 100644 (file)
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -5,7 +5,7 @@
  * 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);