Mercurial > hg

annotate contrib/editmergeps.bat @ 33696:1fa6023240f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: don't drop optional lines after a missing unconditional line The previous behavior was to bail out when hitting 'awol', so 'missing (?)' was also dropped.
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 18 Jul 2017 00:57:11 -0400
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' %*"