Mercurial > hg-stable
comparison tests/test-rhg-no-generaldelta.t @ 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 | 96ea4db4741b |
children |
comparison
equal
deleted
inserted
replaced
48550:47f2a82ae3e4 | 48551:fb691fa90807 |
---|