##// END OF EJS Templates
merge: don't grab wlock when merging in memory...
merge: don't grab wlock when merging in memory I noticed this because we have an internal extension that does an in-memory rebase while holding only a repo lock, which resulted in a developer warning about the working copy lock being taken after the repo lock. Differential Revision: https://phab.mercurial-scm.org/D8665

File last commit:

r32568:4b9b8793 default
r45536:d1471dbb default
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' %*"