Mercurial > public > mercurial-scm > hg-stable
comparison tests/test-subrepo-svn.t @ 48607: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 | e598c874b4af |
| children | 9987d14ad63f |
comparison
equal
deleted
inserted
replaced
| 48606:74973a6d4e67 | 48607:07069fcd9a6e |
|---|