Remove old nushell/merge engine-q

src/README.md

@@ -0,0 +1,5 @@
+# Nushell REPL
+
+This directory contains the main Nushell REPL (read eval print loop) as part of the CLI portion of Nushell, which creates the `nu` binary itself.
+
+Current versions of the `nu` binary will use the Nu argument parsing logic to parse the commandline arguments passed to `nu`, leaving the logic here to be a thin layer around what the core libraries.

src/main.rs

@@ -1,17 +1,3 @@
-<<<<<<< HEAD
-use nu_cli::App as CliApp;
-use nu_errors::ShellError;
-
-fn main() -> Result<(), ShellError> {
-    let mut argv = vec![String::from("nu")];
-    argv.extend(positionals());
-
-    CliApp::run(&argv)
-}
-
-fn positionals() -> Vec<String> {
-    std::env::args().skip(1).collect::<Vec<_>>()
-=======
 mod commands;
 mod config_files;
 mod eval_file;
@@ -360,5 +346,4 @@ impl Command for Nu {
             },
         ]
     }
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 }

src/plugins/nu_plugin_core_inc.rs

@@ -1,14 +1,6 @@
-<<<<<<< HEAD
-use nu_plugin::serve_plugin;
-use nu_plugin_inc::Inc;
-
-fn main() {
-    serve_plugin(&mut Inc::new());
-=======
 use nu_plugin::{serve_plugin, CapnpSerializer};
 use nu_plugin_inc::Inc;
 
 fn main() {
     serve_plugin(&mut Inc::new(), CapnpSerializer {})
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 }