X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=c8539ec0bafce5e238d97d6397a9d08c2c92a09c;hb=a2f8028d3d661b314d5a784764f2f5f9e4c2dde0;hp=4a82b741ae020376ac67b34d5fce86e8a87a3b5d;hpb=b8336519450fdedc8f9cafebc73f7a0226e34e1f;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 4a82b741a..c8539ec0b 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -127,7 +127,7 @@ static void output(int v, const char *fmt, ...)
 	va_end(args);
 }
 
-static void flush_output()
+static void flush_output(void)
 {
 	struct output_buffer *b, *n;
 	for (b = output_list; b; b = n) {