diff mercurial/util.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 376d08ae904f
children 75fc2537d93c
line wrap: on
line diff