view contrib/win32/buildlocal.bat @ 48966:b10a944c0486 stable

tests: demonstrate how conflict markers end up $local *and* $output

When a merge tool is configured to keep conflict markers, they are
supposed to be written to `$local` if `$output` is not mentioned in
the tool's `merge-tools.<tool>.args` config, and in `$output` if it is
mentioned. However, I broke the latter case in D12190.

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

@echo off
rem Double-click this file to (re)build Mercurial for Windows in place.
rem Useful for testing and development.
cd ..\..
del /Q mercurial\*.pyd
del /Q mercurial\*.pyc
rmdir /Q /S mercurial\locale
python setup.py build_py -c -d . build_ext -i build_mo
pause