diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-22 17:47:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-22 19:10:26 -0800 |
| commit | bd2afde8a38b97391b22afebf15c583fb0fffacb (patch) | |
| tree | d2a4357e278f350999c1d991533016231d237abb /read-tree.c | |
| parent | 6dc78e696b8597204b903073da932fc5ed0f419e (diff) | |
| download | git-bd2afde8a38b97391b22afebf15c583fb0fffacb.tar.gz git-bd2afde8a38b97391b22afebf15c583fb0fffacb.tar.xz | |
Give no terminating LF to error() function.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'read-tree.c')
| -rw-r--r-- | read-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/read-tree.c b/read-tree.c index 5580f15ba..0d938724e 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) |