Page MenuHomePhabricator

filemerge: work with `simplemerge.MergeInput` in `filemerge()`
ClosedPublic

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Details

Summary

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().

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.