Merge branch 'maint'

diff --git a/unpack-trees.c b/unpack-trees.c
index 1d7393d84c7ca1506108495f4dd17233a5af7324..bcee99c52e3a9ee8d67f70c577e57bbde8a8b610 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1793,7 +1793,7 @@ int bind_merge(struct cache_entry **src,
        struct cache_entry *a = src[1];
 
        if (o->merge_size != 1)
-               return error("Cannot do a bind merge of %d trees\n",
+               return error("Cannot do a bind merge of %d trees",
                             o->merge_size);
        if (a && old)
                return o->gently ? -1 :