##// END OF EJS Templates
merge: handle linear update to symlink correctly (issue3316)...
merge: handle linear update to symlink correctly (issue3316) This fixes a regression introduced by fcf66193b186. If no file-level merge is needed, we can update flags directly, otherwise we have a conflict to resolve in filemerge.

File last commit:

r12653:5096faaa default
r16255:ca5cc297 stable
Show More
hg.bat
12 lines | 297 B | application/x-msdownload | BatchLexer
@echo off
rem Windows Driver script for Mercurial
setlocal
set HG=%~f0
rem Use a full path to Python (relative to this script) as the standard Python
rem install does not put python.exe on the PATH...
rem %~dp0 is the directory of this script
"%~dp0..\python" "%~dp0hg" %*
endlocal