mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
7d52c13c89
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
3 lines
96 B
Batchfile
3 lines
96 B
Batchfile
@echo off
|
|
powershell -NoProfile -ExecutionPolicy unrestricted -Command "& 'editmergeps.ps1' %*"
|