X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-recursive.c;h=c8539ec0bafce5e238d97d6397a9d08c2c92a09c;hb=67d454fed6ae1f127d2daa57db946df200f2382a;hp=8f72b2c079a68ac5cb9d1c90bb7b72fa779efb5f;hpb=db81e67a7d559544f8464cdfd011208e60b76344;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 8f72b2c07..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) {
@@ -680,6 +680,12 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
 {
 	xpparam_t xpp;
 
+	if (buffer_is_binary(orig->ptr, orig->size) ||
+			buffer_is_binary(src1->ptr, src1->size) ||
+			buffer_is_binary(src2->ptr, src2->size))
+		return error("Cannot merge binary files: %s vs. %s\n",
+			name1, name2);
+
 	memset(&xpp, 0, sizeof(xpp));
 	return xdl_merge(orig,
 			 src1, name1,