sapling/contrib/editmergeps.bat

mirror of https://github.com/facebook/sapling.git synced 2024-10-09 16:31:02 +03:00
@echo off
powershell -NoProfile -ExecutionPolicy unrestricted -Command "& 'editmergeps.ps1' %*"
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 2017-05-19 00:36:46 +03:00			`@echo off`
			`powershell -NoProfile -ExecutionPolicy unrestricted -Command "& 'editmergeps.ps1' %*"`