##// END OF EJS Templates
simplemerge: split out function for rendering :merge3 conflict markers...
simplemerge: split out function for rendering :merge3 conflict markers The results in some duplicate, but the code is very straight-forward and I think it's worth it to have each conflict marker style in a separate function. Differential Revision: https://phab.mercurial-scm.org/D11978

File last commit:

r47647:fc8a5c9e default
r49410:69e76b2a default
Show More
hg.bat
21 lines | 509 B | application/x-msdownload | BatchLexer
Paul Moore
Add a batch file driver for Windows
r6513 @echo off
rem Windows Driver script for Mercurial
setlocal
set HG=%~f0
Matt Harbison
win32: enable legacy I/O mode to fix missing pager output on Windows with py3...
r47647 set PYTHONLEGACYWINDOWSSTDIO=1
FUJIWARA Katsunori
win32: use explicit path to "python.exe" only if it exists...
r19091 rem Use a full path to Python (relative to this script) if it exists,
rem as the standard Python install does not put python.exe on the PATH...
rem Otherwise, expect that python.exe can be found on the PATH.
Paul Moore
Add a batch file driver for Windows
r6513 rem %~dp0 is the directory of this script
FUJIWARA Katsunori
win32: use explicit path to "python.exe" only if it exists...
r19091 if exist "%~dp0..\python.exe" (
"%~dp0..\python" "%~dp0hg" %*
) else (
python "%~dp0hg" %*
)
Paul Moore
Add a batch file driver for Windows
r6513 endlocal
FUJIWARA Katsunori
hg.bat: return exit code explicitly for indirect invocation...
r23934
exit /b %ERRORLEVEL%