Mercurial > hg
view contrib/editmergeps.bat @ 48590:7e503eff3c76
update: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12022
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 18 Jan 2022 13:23:49 -0800 |
parents | 4b9b87930cb3 |
children |
line wrap: on
line source
@echo off powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"