diff mercurial/httppeer.py @ 44398:ddbc296a1f48

merge: drop redundant mergeforce argument from hg.merge() The only caller that passed a value for either `force` or `mergeforce` passed the same value for both, so let's simplify the interface by accepting only `force`. Differential Revision: https://phab.mercurial-scm.org/D8167
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 26 Feb 2020 11:00:50 -0800
parents 9f70512ae2cf
children 89a2afe31e82
line wrap: on
line diff