##// END OF EJS Templates
merge: remove direct rustmod reference...
merge: remove direct rustmod reference We shouldn't rely on this member being present in `dirstate.py`, this creates unnecessary coupling. This also can trigger certain issues in edge-cases where the policy is changed at runtime or multiple Python environments fight, which is an added bonus. Differential Revision: https://phab.mercurial-scm.org/D12217

File last commit:

r32568:4b9b8793 default
r49660:d4486810 6.1 stable
Show More
editmergeps.bat
2 lines | 102 B | application/x-msdownload | BatchLexer
Kostia Balytskyi
contrib: add editmerge version for powershell...
r32329 @echo off
Kostia Balytskyi
contrib: run editmergeps.ps1 from the same location as editmergeps.bat...
r32568 powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"