Mercurial > public > mercurial-scm > hg-stable
diff hgext/githelp.py @ 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 | 89a2afe31e82 |
children | 6000f5b25c9b |