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/parse.rs
+++ b/crates/nu-command/tests/commands/parse.rs
@ -5,6 +5,11 @@ use nu_test_support::{nu, pipeline};
 mod simple {
    use super::*;

+<<<<<<< HEAD
+=======
+    // FIXME: jt: needs more work
+    #[ignore]
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
    #[test]
    fn extracts_fields_from_the_given_the_pattern() {
        Playground::setup("parse_test_1", |dirs, sandbox| {
@ -81,6 +86,11 @@ mod simple {
        })
    }

+<<<<<<< HEAD
+=======
+    // FIXME: jt: needs more work
+    #[ignore]
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
    #[test]
    fn errors_when_missing_closing_brace() {
        Playground::setup("parse_test_regex_5", |dirs, _sandbox| {