Mercurial > hg

diff mercurial/mergeutil.py @ 48749:9ee70e175fed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments The `simplemerge` module is library code; it should not get an unmodified `opts` dict from the `simplemerge` extension. Differential Revision: https://phab.mercurial-scm.org/D12152
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 10 Feb 2022 09:59:07 -0800
parents d4ba4d51f85f
children 6000f5b25c9b
line wrap: on
line diff