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/split_by.rs
+++ b/crates/nu-command/tests/commands/split_by.rs
@ -49,6 +49,10 @@ fn errors_if_no_table_given_as_input() {
            "#
        ));

+<<<<<<< HEAD
        assert!(actual.err.contains("Expected table from pipeline"));
+=======
+        assert!(actual.err.contains("requires a table"));
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
    })
 }