comparison mercurial/i18n.py @ 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 2912b06905dc
children 75979c8d4572
comparison
equal deleted inserted replaced
32328:531e6a57abd2 32329:799615bbf5bf