engine-q merge

2022-02-07 19:11:34 +00:00
parent 265ee1281d 9259a56a28
commit fdce6c49ab
1965 changed files with 119062 additions and 20 deletions
--- a/crates/nu-command/tests/commands/lines.rs
+++ b/crates/nu-command/tests/commands/lines.rs
@ -27,7 +27,11 @@ fn lines_proper_buffering() {
            open lines_test.txt -r
            | lines
            | str length
+<<<<<<< HEAD
            | to json
+=======
+            | to json -r
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
        "#
    ));

@ -46,5 +50,9 @@ fn lines_multi_value_split() {
        "#
    ));

+<<<<<<< HEAD
    assert_eq!(actual.out, "5");
+=======
+    assert_eq!(actual.out, "6");
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 }