Mercurial > public > mercurial-scm > hg-stable

diff tests/test-ssh-repoerror.t @ 48607:07069fcd9a6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: work with `simplemerge.MergeInput` in `filemerge()` We currently pass around pairs of file context objects and labels between functions in the `filemerge` module. I plan to pass around `simplemerge.MergeInput` instead. This patch prepares for that by using the type internally in `filemerge.filemerge()`. Differential Revision: https://phab.mercurial-scm.org/D12017
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 20 Jan 2022 14:42:50 -0800
parents 0c92cd9286ee
children adecb1ab4a0d
line wrap: on
line diff