Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/editmergeps.bat
author Kostia Balytskyi <ikostia@fb.com>
Thu, 18 May 2017 14:36:46 -0700
changeset 32329 799615bbf5bf
child 32567 4b9b87930cb3
permissions -rw-r--r--
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
32329
799615bbf5bf contrib: add editmerge version for powershell
Kostia Balytskyi <ikostia@fb.com>
parents:
diff changeset 
     1
 
@echo off
799615bbf5bf contrib: add editmerge version for powershell
Kostia Balytskyi <ikostia@fb.com>
parents:
diff changeset 
     2
 
powershell -NoProfile -ExecutionPolicy unrestricted -Command "& 'editmergeps.ps1' %*"
mercurial