Merge branch 'master' of https://github.com/cmderdev/cmder into alias

vendor/bin/alias.cmd

@@ -69,9 +69,6 @@ set args=
     )
   )
 
-:: echo _x=%_x%
-:: echo args=%args%
-
 rem #endregion parseargument
 
 if "%ALIASES%" neq "%CMDER_ROOT%\config\user_aliases.cmd" (
@@ -88,11 +85,29 @@ if "%ALIASES%" neq "%CMDER_ROOT%\config\user_aliases.cmd" (
 )
 
 :: create with multiple parameters
+<<<<<<< HEAD
 if [%action%] == [create] (
   if not ["%args%"] == [""] (
     for /f "tokens=1,* usebackq" %%G in (`echo %args%`) do (
       set alias_name=%%G
       set alias_value=%%H
+=======
+if [%1] == [create] (
+  if not [%2] == [] (
+    if not [%3] == [] (
+      set _x=%1=%2
+      :: if command create was submitted
+      set alias_name=%~2
+      shift
+      shift
+      echo %*
+      set alias_value=%*
+
+      for /f "tokens=1,2,* usebackq" %%G in (`echo %*`) do (
+        set alias_name=%%H
+        set alias_value=%%I
+      )
+>>>>>>> ac2082d56d59b3731824e11227eae396278b9f37
     )
   )
 ) else (