contrib/editmergeps.bat
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 05 Dec 2019 09:39:49 -0800
changeset 43816 32d11a23c9cf
parent 32600 4b9b87930cb3
permissions -rw-r--r--
graft: never set both parents equal in the dirstate (issue6098) merge.graft() can set both parents equal in the dirstate when keepparent=True. We don't seem to set that in core, but the evolve extension does use it. So I couldn't figure out a way to add a test for this patch in core. Differential Revision: https://phab.mercurial-scm.org/D7549

@echo off
powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"