view contrib/win32/hg.bat @ 39393:56469d475341

resolve: add config to make hg resolve not re-merge by default

Before this, calling 'hg resolve' with neither -m, -u or -l will
re-merge. This is highly error prone (it's easy to forget to forget a
-m), and pretty bad when it happens (many people have no idea 'hg
resolve' can re-merge, and end up redoing the work of resolving all
the conflicts, because they have no idea there was a backup of their
work).

Differential Revision: https://phab.mercurial-scm.org/D4379

@echo off
rem Windows Driver script for Mercurial

setlocal
set HG=%~f0

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.
rem %~dp0 is the directory of this script

if exist "%~dp0..\python.exe" (
    "%~dp0..\python" "%~dp0hg" %*
) else (
    python "%~dp0hg" %*
)
endlocal

exit /b %ERRORLEVEL%