Resolved conflict in alias.bat merge

This commit is contained in:
Martin Kemp 2015-03-18 10:54:22 +00:00
commit efe244b5fa

View File

@ -5,9 +5,13 @@ set ALIASES=%CMDER_ROOT%\config\aliases
if ["%*"] == [""] echo Use /? for help & echo. & goto :p_show if ["%*"] == [""] echo Use /? for help & echo. & goto :p_show
if ["%1"] == ["/?"] goto:p_help if ["%1"] == ["/?"] goto:p_help
if ["%1"] == ["/reload"] goto:p_reload if ["%1"] == ["/reload"] goto:p_reload
:: /d flag for delete existing alias
if ["%1"] == ["/d"] goto:p_del %* :: if arg is an existing alias, display it
if ["%2"] == [""] echo Insufficient parameters. & goto:p_help if ["%2"] == [""] (
doskey /macros | findstr /b %1= && goto:eof
echo Insufficient parameters. & goto:p_help
)
::validate alias ::validate alias
setlocal setlocal
for /f "delims== tokens=1" %%G in ("%*") do set _temp2=%%G for /f "delims== tokens=1" %%G in ("%*") do set _temp2=%%G