engine-q merge

crates/nu-command/tests/commands/enter.rs

@@ -71,6 +71,7 @@ fn knows_the_filesystems_entered() {
         ));
     })
 }
+<<<<<<< HEAD
 
 #[test]
 fn errors_if_file_not_found() {
@@ -83,3 +84,5 @@ fn errors_if_file_not_found() {
         assert!(actual.err.contains("Cannot find file"));
     })
 }
+=======
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce