Mercurial > public > mercurial-scm > hg-stable

diff setup.py @ 48606:74973a6d4e67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 23ce9e7bf1e5
children 6cfa30681a1d
line wrap: on
line diff