diff tests/test-check-code.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 decc3bd3f20d
children 089cb4d6af5a
line wrap: on
line diff