apply: squelch excessive errors and --whitespace=error-all

[git.git] / read-tree.c

diff --git a/read-tree.c b/read-tree.c
index 4e0cdda..bb50a80 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -619,7 +619,7 @@ static int twoway_merge(struct cache_entry **src)
        struct cache_entry *oldtree = src[1], *newtree = src[2];
 
        if (merge_size != 2)
-               return error("Cannot do a twoway merge of %d trees\n",
+               return error("Cannot do a twoway merge of %d trees",
                             merge_size);
 
        if (current) {
@@ -671,7 +671,7 @@ static int oneway_merge(struct cache_entry **src)
        struct cache_entry *a = src[1];
 
        if (merge_size != 1)
-               return error("Cannot do a oneway merge of %d trees\n",
+               return error("Cannot do a oneway merge of %d trees",
                             merge_size);
 
        if (!a)