Mercurial > hg

view contrib/editmergeps.bat @ 48759:d169e651066b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: use an early return for trivial merges `filemerge.filemerge()` returns `None` if no merge was needed because the two sides were identical. I'd like to move that to the caller. This is a little refactoring to prepare for that. Differential Revision: https://phab.mercurial-scm.org/D12153
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 07 Feb 2022 20:12:09 -0800
parents 4b9b87930cb3
children
line wrap: on
line source

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