Merge branch 'master' into 1.3.15

This commit is contained in:
Dax T Games
2020-04-06 08:48:19 -04:00
committed by GitHub
2 changed files with 7 additions and 1 deletions

6
vendor/init.bat vendored
View File

@ -188,6 +188,10 @@ for /F "delims=" %%F in ('where git.exe 2^>nul') do (
%lib_git% compare_git_versions
)
if defined GIT_INSTALL_ROOT (
goto :FOUND_GIT
)
:: our last hope: our own git...
:VENDORED_GIT
if exist "%CMDER_ROOT%\vendor\git-for-windows" (
@ -370,4 +374,4 @@ set CMDER_INIT_END=%time%
if %time_init% gtr 0 (
"%cmder_root%\vendor\bin\timer.cmd" %CMDER_INIT_START% %CMDER_INIT_END%
)
exit /b
exit /b