Mercurial > public > mercurial-scm > hg-stable

diff mercurial/mergestate.py @ 48604:f970bc616ebc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: remove unused arguments from `_merge()` Differential Revision: https://phab.mercurial-scm.org/D12014
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 20 Jan 2022 11:17:09 -0800
parents 608a35db186c
children b0aa9b0b9c21
line wrap: on
line diff