diff hgweb.cgi @ 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 4b0fc75f9403
children 47ef023d0165
line wrap: on
line diff