diff mercurial/logcmdutil.py @ 48552:bd27dad294b7

simplemerge: remove now-unused `localorother` argument from `merge_lines()` Differential Revision: https://phab.mercurial-scm.org/D11902
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 07 Dec 2021 22:45:31 -0800
parents 5105a9975407
children 91017508a785
line wrap: on
line diff