Merge branch 'js/convert-typofix' into maint

gitster · gitster · commit 6141e0cc00d5 · 2020-02-14T12:42:34.000-08:00
Typofix.

* js/convert-typofix:
  convert: fix typo
diff --git a/convert.c b/convert.c
@@ -1940,7 +1940,7 @@ static struct stream_filter *ident_filter(const struct object_id *oid)
  * the contents cannot be filtered without reading the whole thing
  * in-core.
  *
- * Note that you would be crazy to set CRLF, smuge/clean or ident to a
+ * Note that you would be crazy to set CRLF, smudge/clean or ident to a
  * large binary blob you would want us not to slurp into the memory!
  */
 struct stream_filter *get_stream_filter(const struct index_state *istate,

Original file line number	Diff line number	Diff line change
`@@ -1940,7 +1940,7 @@ static struct stream_filter ident_filter(const struct object_id oid)`
`1940`	`1940`	`* the contents cannot be filtered without reading the whole thing`
`1941`	`1941`	`* in-core.`
`1942`	`1942`	`*`
`1943`		`- * Note that you would be crazy to set CRLF, smuge/clean or ident to a`
	`1943`	`+ * Note that you would be crazy to set CRLF, smudge/clean or ident to a`
`1944`	`1944`	`* large binary blob you would want us not to slurp into the memory!`
`1945`	`1945`	`*/`
`1946`	`1946`	`struct stream_filter get_stream_filter(const struct index_state istate,`