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/path/split.rs
+++ b/crates/nu-command/tests/commands/path/split.rs
@ -17,7 +17,11 @@ fn splits_correctly_single_path() {
    let actual = nu!(
        cwd: "tests", pipeline(
        r#"
+<<<<<<< HEAD
            echo ['home/viking/spam.txt']
+=======
+            'home/viking/spam.txt'
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
            | path split
            | last
        "#
@ -39,6 +43,10 @@ fn splits_correctly_with_column_path() {
            ]
            | path split -c [ home barn ]
            | get barn
+<<<<<<< HEAD
+=======
+            | flatten
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
            | length
        "#
    ));