diff mercurial/pvec.py @ 48551:fb691fa90807

simplemerge: add a specialized function for "union", "local", "other" Differential Revision: https://phab.mercurial-scm.org/D11901
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 07 Dec 2021 22:33:18 -0800
parents d4ba4d51f85f
children 6000f5b25c9b
line wrap: on
line diff