##// 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:

r13383:70ef5b61 default
r49410:69e76b2a default
Show More
buildlocal.bat
9 lines | 267 B | application/x-msdownload | BatchLexer
@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