From bd2afde8a38b97391b22afebf15c583fb0fffacb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 22 Feb 2006 17:47:10 -0800 Subject: Give no terminating LF to error() function. Signed-off-by: Junio C Hamano --- read-tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'read-tree.c') diff --git a/read-tree.c b/read-tree.c index 5580f15ba2..0d938724e5 100644 --- a/read-tree.c +++ b/read-tree.c @@ -564,7 +564,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) { @@ -616,7 +616,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) -- cgit v1.2.3