Mercurial > public > mercurial-scm > hg-stable
diff hgweb.cgi @ 48606: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 | c102b704edb5 |
children | d5cd1fd690f3 |