Merge branch 'maint-1.6.1' into maint

gitster · gitster · commit f06b9f1dffa6 · 2009-04-24T22:58:31.000-07:00
* maint-1.6.1:
  test-genrandom: Add newline to usage string
diff --git a/test-genrandom.c b/test-genrandom.c
@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
 	unsigned char *c;
 
 	if (argc < 2 || argc > 3) {
-		fprintf( stderr, "Usage: %s <seed_string> [<size>]", argv[0]);
+		fprintf(stderr, "Usage: %s <seed_string> [<size>]\n", argv[0]);
 		return 1;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ int main(int argc, char *argv[])`
`13`	`13`	`unsigned char *c;`
`14`	`14`
`15`	`15`	`if (argc < 2 \|\| argc > 3) {`
`16`		`- fprintf( stderr, "Usage: %s <seed_string> [<size>]", argv[0]);`
	`16`	`+ fprintf(stderr, "Usage: %s <seed_string> [<size>]\n", argv[0]);`
`17`	`17`	`return 1;`
`18`	`18`	`}`
`19`	`19`