Mercurial > hg
comparison tests/test-push-checkheads-unpushed-D2.t @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 20 Jan 2022 14:13:12 -0800 |
| parents | 9261f6c1d39b |
| children |
comparison
equal
deleted
inserted
replaced
| 48583:a809f1465a76 | 48584:74973a6d4e67 |
|---|