Mercurial > public > mercurial-scm > hg-stable

diff mercurial/mergestate.py @ 48552:bd27dad294b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: remove now-unused `localorother` argument from `merge_lines()` Differential Revision: https://phab.mercurial-scm.org/D11902
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 07 Dec 2021 22:45:31 -0800
parents 608a35db186c
children b0aa9b0b9c21
line wrap: on
line diff