Remove old nushell/merge engine-q

2025-06-30 22:50:14 +02:00 · 2022-02-07 14:54:06 -05:00
parent 10c4c50f1f
commit d70d91e559
430 changed files with 14543 additions and 7865 deletions
--- a/crates/nu-command/tests/commands/path/exists.rs
+++ b/crates/nu-command/tests/commands/path/exists.rs
@ -2,11 +2,8 @@ use nu_test_support::fs::Stub::EmptyFile;
 use nu_test_support::nu;
 use nu_test_support::playground::Playground;

-<<<<<<< HEAD
-=======
 // FIXME: jt: needs more work
 #[ignore]
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 #[test]
 fn checks_if_existing_file_exists() {
    Playground::setup("path_exists_1", |dirs, sandbox| {