Mercurial > hg
view pyproject.toml @ 48759:d169e651066b
mergestate: use an early return for trivial merges
`filemerge.filemerge()` returns `None` if no merge was needed because
the two sides were identical. I'd like to move that to the
caller. This is a little refactoring to prepare for that.
Differential Revision: https://phab.mercurial-scm.org/D12153
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 07 Feb 2022 20:12:09 -0800 |
parents | 58fe6d127a01 |
children |
line wrap: on
line source
[build-system] requires = ["setuptools", "wheel"] [tool.black] line-length = 80 exclude = ''' build/ | wheelhouse/ | dist/ | packages/ | \.hg/ | \.mypy_cache/ | \.venv/ | mercurial/thirdparty/ ''' skip-string-normalization = true quiet = true