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

@echo off
powershell -NoProfile -ExecutionPolicy unrestricted -Command "& 'editmergeps.ps1' %*"