Mercurial > hg

view contrib/editmergeps.bat @ 48966:b10a944c0486 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: demonstrate how conflict markers end up $local *and* $output When a merge tool is configured to keep conflict markers, they are supposed to be written to `$local` if `$output` is not mentioned in the tool's `merge-tools.<tool>.args` config, and in `$output` if it is mentioned. However, I broke the latter case in D12190. Differential Revision: https://phab.mercurial-scm.org/D12378
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 15 Mar 2022 13:40:45 -0700
parents 4b9b87930cb3
children
line wrap: on
line source

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