adds tests that compare streams of same length

assemblaj · assemblaj · commit 49532972b7c7 · 2019-10-15T10:19:25.000-04:00
diff --git a/src/stream/stream/mod.rs b/src/stream/stream/mod.rs
@@ -1186,7 +1186,6 @@ extension_trait! {
         }
 
         #[doc = r#"
-<<<<<<< HEAD
             Combines multiple streams into a single stream of all their outputs.
 
             Items are yielded as soon as they're received, and the stream continues yield until both

Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,6 @@ extension_trait! {`
`1186`	`1186`	`}`
`1187`	`1187`
`1188`	`1188`	`#[doc = r#"`
`1189`		`-<<<<<<< HEAD`
`1190`	`1189`	`Combines multiple streams into a single stream of all their outputs.`
`1191`	`1190`
`1192`	`1191`	`Items are yielded as soon as they're received, and the stream continues yield until both`