Mercurial > hg

view black.toml @ 44342:7f7c8521e9bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add test of rebase with conflict in merge commit It doesn't seem like we had any tests of this. I think it's pretty weird that the two parents we're merging are not the working copy parents during the conflict resolution. Differential Revision: https://phab.mercurial-scm.org/D7824
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 10 Jan 2020 17:46:10 -0800
parents 5e84a96d865b
children
line wrap: on
line source

[tool.black]
line-length = 80
exclude = '''
build/
| wheelhouse/
| dist/
| packages/
| \.hg/
| \.mypy_cache/
| \.venv/
| mercurial/thirdparty/
'''
skip-string-normalization = true
quiet = true