Mercurial > hg

annotate contrib/editmergeps.bat @ 41596:630af04d4ae4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: fix broken backup of conflicting untracked file Differential Revision: https://phab.mercurial-scm.org/D5852
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 04 Feb 2019 20:49:45 -0800
parents 4b9b87930cb3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
32329
799615bbf5bf contrib: add editmerge version for powershell
Kostia Balytskyi <ikostia@fb.com>
parents:
diff changeset
1 @echo off
32567
4b9b87930cb3 contrib: run editmergeps.ps1 from the same location as editmergeps.bat
Kostia Balytskyi <ikostia@fb.com>
parents: 32329
diff changeset
2 powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"