##// END OF EJS Templates
rebase: delete seemingly unnecessary needupdate()...
rebase: delete seemingly unnecessary needupdate() This seemed to be about checking that the user hasn't updated away when we asked them to resolve merge conflicts. These days we call `cmdutil.checkunfinished()` and refuse to update, so the user shouldn't be able to get into this state. `test-rebase-interruptions.t` actually has some tests where it disables the rebase extension in order to be allowed to do some of these updates. That still passes, but I wouldn't personally haved cared if that failed. Differential Revision: https://phab.mercurial-scm.org/D7825

File last commit:

r32568:4b9b8793 default
r44505:894c91c2 default
Show More
editmergeps.bat
2 lines | 102 B | application/x-msdownload | BatchLexer
@echo off
powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"