Mercurial > hg-stable

view contrib/editmergeps.bat @ 32368:799615bbf5bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib: add editmerge version for powershell This just adds a translation of existing contrib/editmerge to powershell. It allows users on Windows to iteratively resolve conflicts in their editor of choice. # no-check-commit
author Kostia Balytskyi <ikostia@fb.com>
date Thu, 18 May 2017 14:36:46 -0700
parents
children 4b9b87930cb3
line wrap: on
line source

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