comparison hgext/patchbomb.py @ 48585:07069fcd9a6e

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 5ced12cfa41b
children 6000f5b25c9b
comparison
equal deleted inserted replaced
48584:74973a6d4e67 48585:07069fcd9a6e