##// END OF EJS Templates
shelve: use more accurate description in conflict marker...
shelve: use more accurate description in conflict marker We use "shelve" and "working-copy" instead of "source" and "dest". This is a net win. Differential Revision: https://phab.mercurial-scm.org/D3694

File last commit:

r32568:4b9b8793 default
r38638:9b077e5f @74 default
Show More
editmergeps.bat
2 lines | 102 B | application/x-msdownload | BatchLexer
@echo off
powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"