diff mercurial/server.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 ffd3e823a7e5
children 6000f5b25c9b
line wrap: on
line diff