Mercurial > hg
comparison contrib/build-linux-wheels.sh @ 32329:799615bbf5bf
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 | fcddcf442e4f |
children | 637267114513 |
comparison
equal
deleted
inserted
replaced
32328:531e6a57abd2 | 32329:799615bbf5bf |
---|