mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give no terminating LF to error() function.

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-02-22 17:47:10 -08:00
parent 6dc78e696b
commit bd2afde8a3
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
read-tree.c
View File

@ -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)