comparison mercurial/httppeer.py @ 48604:f970bc616ebc

filemerge: remove unused arguments from `_merge()` Differential Revision: https://phab.mercurial-scm.org/D12014
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 20 Jan 2022 11:17:09 -0800
parents 04688c51f81f
children a0da5075bca3
comparison
equal deleted inserted replaced
48603:77e24ee8994b 48604:f970bc616ebc