Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/patch.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 | 290f9c150f70 |
children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
48551:fb691fa90807 | 48552:bd27dad294b7 |
---|