Mercurial > hg
view contrib/win32/buildlocal.bat @ 46139:3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
This adds support for the new "mergediff" conflict marker style to
"merge-tools.<tool>.premerge" (the new value is called
"keep-mergediff").
Differential Revision: https://phab.mercurial-scm.org/D9606
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 14 Dec 2020 18:09:37 -0800 |
parents | 70ef5b610222 |
children |
line wrap: on
line source
@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