Merge commit '882d8795c6ff65c02f2657e596391748d1b6b7f5'

diff --cc .vim/bundle/black/.flake8
Simple merge

diff --cc .vim/bundle/black/.git_archival.txt
index 0000000000000000000000000000000000000000,8fb235d7045be0330d94bcb3abd2ac43badaa197..8fb235d7045be0330d94bcb3abd2ac43badaa197
mode 000000,100644..100644
--- /dev/null
--- 2/.git_archival.txt
+++ b/.vim/bundle/black/.git_archival.txt

diff --cc .vim/bundle/black/.gitattributes
index 0000000000000000000000000000000000000000,00a7b00c94e08b86c765d47689b6523148c46eec..00a7b00c94e08b86c765d47689b6523148c46eec
mode 000000,100644..100644
--- /dev/null
--- 2/.gitattributes
+++ b/.vim/bundle/black/.gitattributes

diff --cc .vim/bundle/black/.github/ISSUE_TEMPLATE/bug_report.md
Simple merge

diff --cc .vim/bundle/black/.github/ISSUE_TEMPLATE/style_issue.md
Simple merge

diff --cc .vim/bundle/black/.github/PULL_REQUEST_TEMPLATE.md
Simple merge

diff --cc .vim/bundle/black/.github/dependabot.yml
index 0000000000000000000000000000000000000000,325cb31af1cca78965ebed4b88347b63e79dd597..325cb31af1cca78965ebed4b88347b63e79dd597
mode 000000,100644..100644
--- /dev/null
--- 2/.github/dependabot.yml
+++ b/.vim/bundle/black/.github/dependabot.yml

diff --cc .vim/bundle/black/.github/workflows/changelog.yml
Simple merge

diff --cc .vim/bundle/black/.github/workflows/diff_shades.yml
index 0000000000000000000000000000000000000000,97db907abc8787eda5ca18f732239690185bca7a..97db907abc8787eda5ca18f732239690185bca7a
mode 000000,100644..100644
--- /dev/null
--- 2/.github/workflows/diff_shades.yml
+++ b/.vim/bundle/black/.github/workflows/diff_shades.yml

diff --cc .vim/bundle/black/.github/workflows/diff_shades_comment.yml
index 0000000000000000000000000000000000000000,b86bd93410e6f32b5dc8de4ee0be7deca1489408..b86bd93410e6f32b5dc8de4ee0be7deca1489408
mode 000000,100644..100644
--- /dev/null
--- 2/.github/workflows/diff_shades_comment.yml
+++ b/.vim/bundle/black/.github/workflows/diff_shades_comment.yml

diff --cc .vim/bundle/black/.github/workflows/doc.yml
Simple merge

diff --cc .vim/bundle/black/.github/workflows/docker.yml
Simple merge

diff --cc .vim/bundle/black/.github/workflows/fuzz.yml
Simple merge

diff --cc .vim/bundle/black/.github/workflows/lint.yml
Simple merge

diff --cc .vim/bundle/black/.github/workflows/pypi_upload.yml
Simple merge

diff --cc .vim/bundle/black/.github/workflows/test.yml
Simple merge

diff --cc .vim/bundle/black/.github/workflows/upload_binary.yml
Simple merge

diff --cc .vim/bundle/black/.gitignore
Simple merge

diff --cc .vim/bundle/black/.pre-commit-config.yaml
Simple merge

diff --cc .vim/bundle/black/.pre-commit-hooks.yaml
Simple merge

diff --cc .vim/bundle/black/.readthedocs.yaml
Simple merge

diff --cc .vim/bundle/black/AUTHORS.md
Simple merge

diff --cc .vim/bundle/black/CHANGES.md
Simple merge

diff --cc .vim/bundle/black/CITATION.cff
index 0000000000000000000000000000000000000000,7ff0e3ca9bc075f7d30f12ebfb380c98378614b1..7ff0e3ca9bc075f7d30f12ebfb380c98378614b1
mode 000000,100644..100644
--- /dev/null
--- 2/CITATION.cff
+++ b/.vim/bundle/black/CITATION.cff

diff --cc .vim/bundle/black/Dockerfile
Simple merge

diff --cc .vim/bundle/black/README.md
Simple merge

diff --cc .vim/bundle/black/SECURITY.md
index 0000000000000000000000000000000000000000,47049501183d391e3419c279929a10bfa543f4d8..47049501183d391e3419c279929a10bfa543f4d8
mode 000000,100644..100644
--- /dev/null
--- 2/SECURITY.md
+++ b/.vim/bundle/black/SECURITY.md

diff --cc .vim/bundle/black/action.yml
Simple merge

diff --cc .vim/bundle/black/action/main.py
Simple merge

diff --cc .vim/bundle/black/autoload/black.vim
Simple merge

diff --cc .vim/bundle/black/docs/compatible_configs/pylint/pylintrc
Simple merge

diff --cc .vim/bundle/black/docs/compatible_configs/pylint/pyproject.toml
Simple merge

diff --cc .vim/bundle/black/docs/compatible_configs/pylint/setup.cfg
Simple merge

diff --cc .vim/bundle/black/docs/conf.py
Simple merge

diff --cc .vim/bundle/black/docs/contributing/gauging_changes.md
Simple merge

diff --cc .vim/bundle/black/docs/contributing/index.md
index 0000000000000000000000000000000000000000,3314c8eaa39f3863db95fbd056695f747c597bb7..3314c8eaa39f3863db95fbd056695f747c597bb7
mode 000000,100644..100644
--- /dev/null
--- 2/docs/contributing/index.md
+++ b/.vim/bundle/black/docs/contributing/index.md

diff --cc .vim/bundle/black/docs/contributing/issue_triage.md
Simple merge

diff --cc .vim/bundle/black/docs/contributing/reference/reference_classes.rst
Simple merge

diff --cc .vim/bundle/black/docs/contributing/reference/reference_exceptions.rst
Simple merge

diff --cc .vim/bundle/black/docs/contributing/reference/reference_functions.rst
Simple merge

diff --cc .vim/bundle/black/docs/contributing/reference/reference_summary.rst
Simple merge

diff --cc .vim/bundle/black/docs/contributing/release_process.md
Simple merge

diff --cc .vim/bundle/black/docs/contributing/the_basics.md
Simple merge

diff --cc .vim/bundle/black/docs/faq.md
Simple merge

diff --cc .vim/bundle/black/docs/getting_started.md
Simple merge

diff --cc .vim/bundle/black/docs/guides/index.md
index 0000000000000000000000000000000000000000,127279b5e81dd190d07d6f452abb202ecc603ebc..127279b5e81dd190d07d6f452abb202ecc603ebc
mode 000000,100644..100644
--- /dev/null
--- 2/docs/guides/index.md
+++ b/.vim/bundle/black/docs/guides/index.md

diff --cc .vim/bundle/black/docs/guides/introducing_black_to_your_project.md
Simple merge

diff --cc .vim/bundle/black/docs/guides/using_black_with_other_tools.md
Simple merge

diff --cc .vim/bundle/black/docs/index.md
index 0000000000000000000000000000000000000000,49a44ecca5a38c2bd40987be5789508fe1e01ac8..49a44ecca5a38c2bd40987be5789508fe1e01ac8
mode 000000,100644..100644
--- /dev/null
--- 2/docs/index.md
+++ b/.vim/bundle/black/docs/index.md

diff --cc .vim/bundle/black/docs/integrations/editors.md
Simple merge

diff --cc .vim/bundle/black/docs/integrations/github_actions.md
Simple merge

diff --cc .vim/bundle/black/docs/integrations/index.md
index 0000000000000000000000000000000000000000,33135d08f1ad53bd87b857034e110d528b5f4d00..33135d08f1ad53bd87b857034e110d528b5f4d00
mode 000000,100644..100644
--- /dev/null
--- 2/docs/integrations/index.md
+++ b/.vim/bundle/black/docs/integrations/index.md

diff --cc .vim/bundle/black/docs/integrations/source_version_control.md
Simple merge

diff --cc .vim/bundle/black/docs/license.md
index 0000000000000000000000000000000000000000,132c95bfe2a944733147f0cd0e16fdff67c6e8fa..132c95bfe2a944733147f0cd0e16fdff67c6e8fa
mode 000000,100644..100644
--- /dev/null
--- 2/docs/license.md
+++ b/.vim/bundle/black/docs/license.md

diff --cc .vim/bundle/black/docs/requirements.txt
Simple merge

diff --cc .vim/bundle/black/docs/the_black_code_style/current_style.md
Simple merge

diff --cc .vim/bundle/black/docs/the_black_code_style/future_style.md
Simple merge

diff --cc .vim/bundle/black/docs/the_black_code_style/index.md
index 0000000000000000000000000000000000000000,1719347eec81ae97a10f181e149a6fb2194acbcc..1719347eec81ae97a10f181e149a6fb2194acbcc
mode 000000,100644..100644
--- /dev/null
--- 2/docs/the_black_code_style/index.md
+++ b/.vim/bundle/black/docs/the_black_code_style/index.md

diff --cc .vim/bundle/black/docs/usage_and_configuration/black_as_a_server.md
Simple merge

diff --cc .vim/bundle/black/docs/usage_and_configuration/black_docker_image.md
index 0000000000000000000000000000000000000000,85aec91ef1c387fdc5d5162b037b6c97f7e73cbe..85aec91ef1c387fdc5d5162b037b6c97f7e73cbe
mode 000000,100644..100644
--- /dev/null
--- 2/docs/usage_and_configuration/black_docker_image.md
+++ b/.vim/bundle/black/docs/usage_and_configuration/black_docker_image.md

diff --cc .vim/bundle/black/docs/usage_and_configuration/file_collection_and_discovery.md
Simple merge

diff --cc .vim/bundle/black/docs/usage_and_configuration/index.md
index 0000000000000000000000000000000000000000,1c86a49b6865610cd0b685076c66d195c107dc10..1c86a49b6865610cd0b685076c66d195c107dc10
mode 000000,100644..100644
--- /dev/null
--- 2/docs/usage_and_configuration/index.md
+++ b/.vim/bundle/black/docs/usage_and_configuration/index.md

diff --cc .vim/bundle/black/docs/usage_and_configuration/the_basics.md
Simple merge

diff --cc .vim/bundle/black/gallery/gallery.py
Simple merge

diff --cc .vim/bundle/black/plugin/black.vim
Simple merge

diff --cc .vim/bundle/black/pyproject.toml
Simple merge

diff --cc .vim/bundle/black/scripts/check_pre_commit_rev_in_example.py
Simple merge

diff --cc .vim/bundle/black/scripts/check_version_in_basics_example.py
Simple merge

diff --cc .vim/bundle/black/scripts/diff_shades_gha_helper.py
index 0000000000000000000000000000000000000000,895516deb51b03ca708c097dc7979e449eeca07a..895516deb51b03ca708c097dc7979e449eeca07a
mode 000000,100644..100644
--- /dev/null
--- 2/scripts/diff_shades_gha_helper.py
+++ b/.vim/bundle/black/scripts/diff_shades_gha_helper.py

diff --cc .vim/bundle/black/scripts/fuzz.py
Simple merge

diff --cc .vim/bundle/black/scripts/make_width_table.py
index 0000000000000000000000000000000000000000,3c7cae60f7fbffd2a309fba37894eaeb0474607d..3c7cae60f7fbffd2a309fba37894eaeb0474607d
mode 000000,100644..100644
--- /dev/null
--- 2/scripts/make_width_table.py
+++ b/.vim/bundle/black/scripts/make_width_table.py

diff --cc .vim/bundle/black/scripts/migrate-black.py
index 0000000000000000000000000000000000000000,ff52939460ccc26e7f851720acf75600cea71641..ff52939460ccc26e7f851720acf75600cea71641
mode 000000,100755..100755
--- /dev/null
--- 2/scripts/migrate-black.py
+++ b/.vim/bundle/black/scripts/migrate-black.py

diff --cc .vim/bundle/black/src/black/__init__.py
Simple merge

diff --cc .vim/bundle/black/src/black/_width_table.py
index 0000000000000000000000000000000000000000,f3304e48ed04935f184c49cb52cae07b232032fd..f3304e48ed04935f184c49cb52cae07b232032fd
mode 000000,100644..100644
--- /dev/null
--- 2/src/black/_width_table.py
+++ b/.vim/bundle/black/src/black/_width_table.py

diff --cc .vim/bundle/black/src/black/brackets.py
Simple merge

diff --cc .vim/bundle/black/src/black/cache.py
Simple merge

diff --cc .vim/bundle/black/src/black/comments.py
Simple merge

diff --cc .vim/bundle/black/src/black/concurrency.py
Simple merge

diff --cc .vim/bundle/black/src/black/const.py
Simple merge

diff --cc .vim/bundle/black/src/black/debug.py
Simple merge

diff --cc .vim/bundle/black/src/black/files.py
Simple merge

diff --cc .vim/bundle/black/src/black/handle_ipynb_magics.py
Simple merge

diff --cc .vim/bundle/black/src/black/linegen.py
Simple merge

diff --cc .vim/bundle/black/src/black/lines.py
Simple merge

diff --cc .vim/bundle/black/src/black/mode.py
Simple merge

diff --cc .vim/bundle/black/src/black/nodes.py
Simple merge

diff --cc .vim/bundle/black/src/black/numerics.py
Simple merge

diff --cc .vim/bundle/black/src/black/output.py
Simple merge

diff --cc .vim/bundle/black/src/black/parsing.py
Simple merge

diff --cc .vim/bundle/black/src/black/report.py
Simple merge

diff --cc .vim/bundle/black/src/black/rusty.py
Simple merge

diff --cc .vim/bundle/black/src/black/strings.py
Simple merge

diff --cc .vim/bundle/black/src/black/trans.py
Simple merge

diff --cc .vim/bundle/black/src/blackd/__init__.py
Simple merge

diff --cc .vim/bundle/black/src/blackd/__main__.py
index 0000000000000000000000000000000000000000,b5a4b137446f9ef12422e14079012b4cf1982a63..b5a4b137446f9ef12422e14079012b4cf1982a63
mode 000000,100644..100644
--- /dev/null
--- 2/src/blackd/__main__.py
+++ b/.vim/bundle/black/src/blackd/__main__.py

diff --cc .vim/bundle/black/src/blackd/middlewares.py
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/Grammar.txt
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/README
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/pgen2/conv.py
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/pgen2/driver.py
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/pgen2/grammar.py
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/pgen2/literals.py
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/pgen2/parse.py
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/pgen2/pgen.py
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/pgen2/token.py
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/pgen2/tokenize.py
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/pygram.py
Simple merge

diff --cc .vim/bundle/black/src/blib2to3/pytree.py
Simple merge

diff --cc .vim/bundle/black/test_requirements.txt
Simple merge

diff --cc .vim/bundle/black/tests/conftest.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/attribute_access_on_number_literals.py
index 0000000000000000000000000000000000000000,7c16bdfb3a52bd5ff45ffd89fe430504fe40d3c6..7c16bdfb3a52bd5ff45ffd89fe430504fe40d3c6
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/attribute_access_on_number_literals.py
+++ b/.vim/bundle/black/tests/data/cases/attribute_access_on_number_literals.py

diff --cc .vim/bundle/black/tests/data/cases/beginning_backslash.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/bracketmatch.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/class_blank_parentheses.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/class_methods_new_line.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/collections.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/comment_after_escaped_newline.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/comments.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/comments2.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/comments3.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/comments4.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/comments5.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/comments6.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/comments8.py
index 0000000000000000000000000000000000000000,a2030c2a092628e61e25e467baef7ffa6581a3e2..a2030c2a092628e61e25e467baef7ffa6581a3e2
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/comments8.py
+++ b/.vim/bundle/black/tests/data/cases/comments8.py

diff --cc .vim/bundle/black/tests/data/cases/comments9.py
index 0000000000000000000000000000000000000000,77b25556e74aae2dc4a02e4e32f2b7aac460d484..77b25556e74aae2dc4a02e4e32f2b7aac460d484
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/comments9.py
+++ b/.vim/bundle/black/tests/data/cases/comments9.py

diff --cc .vim/bundle/black/tests/data/cases/comments_non_breaking_space.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/composition.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/composition_no_trailing_comma.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/conditional_expression.py
index 0000000000000000000000000000000000000000,c30cd76c791855c7670ce2f4284b2ee454bab707..c30cd76c791855c7670ce2f4284b2ee454bab707
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/conditional_expression.py
+++ b/.vim/bundle/black/tests/data/cases/conditional_expression.py

diff --cc .vim/bundle/black/tests/data/cases/docstring.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/docstring_no_extra_empty_line_before_eof.py
index 0000000000000000000000000000000000000000,6fea860adf6aab2a3b5ec6ae61d954a07fe7c77d..6fea860adf6aab2a3b5ec6ae61d954a07fe7c77d
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/docstring_no_extra_empty_line_before_eof.py
+++ b/.vim/bundle/black/tests/data/cases/docstring_no_extra_empty_line_before_eof.py

diff --cc .vim/bundle/black/tests/data/cases/docstring_no_string_normalization.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/docstring_preview.py
index 0000000000000000000000000000000000000000,ff4819acb67a876c50377bcc535f179332c6aed7..ff4819acb67a876c50377bcc535f179332c6aed7
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/docstring_preview.py
+++ b/.vim/bundle/black/tests/data/cases/docstring_preview.py

diff --cc .vim/bundle/black/tests/data/cases/docstring_preview_no_string_normalization.py
index 0000000000000000000000000000000000000000,712c7364f51bd97d73b1c1b8f0bd82e6274ba913..712c7364f51bd97d73b1c1b8f0bd82e6274ba913
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/docstring_preview_no_string_normalization.py
+++ b/.vim/bundle/black/tests/data/cases/docstring_preview_no_string_normalization.py

diff --cc .vim/bundle/black/tests/data/cases/empty_lines.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/expression.diff
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/expression.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtonoff.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtonoff2.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtonoff3.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtonoff4.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtonoff5.py
index 0000000000000000000000000000000000000000,181151b6bd6114d677b233e363c9606315e877da..181151b6bd6114d677b233e363c9606315e877da
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/fmtonoff5.py
+++ b/.vim/bundle/black/tests/data/cases/fmtonoff5.py

diff --cc .vim/bundle/black/tests/data/cases/fmtpass_imports.py
index 0000000000000000000000000000000000000000,8b3c0bc662a45bda119ebeb21c2b68e2b68ef733..8b3c0bc662a45bda119ebeb21c2b68e2b68ef733
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/fmtpass_imports.py
+++ b/.vim/bundle/black/tests/data/cases/fmtpass_imports.py

diff --cc .vim/bundle/black/tests/data/cases/fmtskip.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtskip2.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtskip3.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtskip4.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtskip5.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtskip6.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/fmtskip7.py
index 0000000000000000000000000000000000000000,15ac0ad7080eb8e212e323f03854707c350531f9..15ac0ad7080eb8e212e323f03854707c350531f9
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/fmtskip7.py
+++ b/.vim/bundle/black/tests/data/cases/fmtskip7.py

diff --cc .vim/bundle/black/tests/data/cases/fmtskip8.py
index 0000000000000000000000000000000000000000,38e9c2a9f47b99acbe8e710ddae9eb675a94797c..38e9c2a9f47b99acbe8e710ddae9eb675a94797c
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/fmtskip8.py
+++ b/.vim/bundle/black/tests/data/cases/fmtskip8.py

diff --cc .vim/bundle/black/tests/data/cases/fstring.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/funcdef_return_type_trailing_comma.py
index 0000000000000000000000000000000000000000,9b9b9c673de63917b1ec3ec7d137dce7ede97302..9b9b9c673de63917b1ec3ec7d137dce7ede97302
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/funcdef_return_type_trailing_comma.py
+++ b/.vim/bundle/black/tests/data/cases/funcdef_return_type_trailing_comma.py

diff --cc .vim/bundle/black/tests/data/cases/function.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/function2.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/function_trailing_comma.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/ignore_pyi.py
index 0000000000000000000000000000000000000000,4fae7530eb98ab918766980229dc88320c83a8e0..4fae7530eb98ab918766980229dc88320c83a8e0
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/ignore_pyi.py
+++ b/.vim/bundle/black/tests/data/cases/ignore_pyi.py

diff --cc .vim/bundle/black/tests/data/cases/import_spacing.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/linelength6.py
index 0000000000000000000000000000000000000000,158038bf960607aa048e6cde702c8a4ce6c0bb62..158038bf960607aa048e6cde702c8a4ce6c0bb62
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/linelength6.py
+++ b/.vim/bundle/black/tests/data/cases/linelength6.py

diff --cc .vim/bundle/black/tests/data/cases/long_strings_flag_disabled.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/module_docstring_1.py
index 0000000000000000000000000000000000000000,d5897b4db60e7fbd6adf309caef9528749f389b1..d5897b4db60e7fbd6adf309caef9528749f389b1
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/module_docstring_1.py
+++ b/.vim/bundle/black/tests/data/cases/module_docstring_1.py

diff --cc .vim/bundle/black/tests/data/cases/module_docstring_2.py
index 0000000000000000000000000000000000000000,e1f81b4d76b5a3c85044d6a4ce8de67c77932e3d..e1f81b4d76b5a3c85044d6a4ce8de67c77932e3d
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/module_docstring_2.py
+++ b/.vim/bundle/black/tests/data/cases/module_docstring_2.py

diff --cc .vim/bundle/black/tests/data/cases/module_docstring_3.py
index 0000000000000000000000000000000000000000,0631e136a3d85f8de815ea34b7e57de914aea1da..0631e136a3d85f8de815ea34b7e57de914aea1da
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/module_docstring_3.py
+++ b/.vim/bundle/black/tests/data/cases/module_docstring_3.py

diff --cc .vim/bundle/black/tests/data/cases/module_docstring_4.py
index 0000000000000000000000000000000000000000,515174dcc04fcd78b40b96986dbcbe6d46fcef2f..515174dcc04fcd78b40b96986dbcbe6d46fcef2f
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/module_docstring_4.py
+++ b/.vim/bundle/black/tests/data/cases/module_docstring_4.py

diff --cc .vim/bundle/black/tests/data/cases/multiline_consecutive_open_parentheses_ignore.py
index 0000000000000000000000000000000000000000,6ec8bb454088d5707c7db4b61e223655c1f695db..6ec8bb454088d5707c7db4b61e223655c1f695db
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/multiline_consecutive_open_parentheses_ignore.py
+++ b/.vim/bundle/black/tests/data/cases/multiline_consecutive_open_parentheses_ignore.py

diff --cc .vim/bundle/black/tests/data/cases/nested_stub.py
index 0000000000000000000000000000000000000000,b81549ec115c9bec521cb606d5ec9d91dc2924f2..b81549ec115c9bec521cb606d5ec9d91dc2924f2
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/nested_stub.py
+++ b/.vim/bundle/black/tests/data/cases/nested_stub.py

diff --cc .vim/bundle/black/tests/data/cases/numeric_literals.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/numeric_literals_skip_underscores.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/one_element_subscript.py
index 0000000000000000000000000000000000000000,39205ba9f7aae25cafd20b132920bcb676420a57..39205ba9f7aae25cafd20b132920bcb676420a57
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/one_element_subscript.py
+++ b/.vim/bundle/black/tests/data/cases/one_element_subscript.py

diff --cc .vim/bundle/black/tests/data/cases/parenthesized_context_managers.py
index 0000000000000000000000000000000000000000,16645a18baa25b65deb728300c91e44ae92a5c55..16645a18baa25b65deb728300c91e44ae92a5c55
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/parenthesized_context_managers.py
+++ b/.vim/bundle/black/tests/data/cases/parenthesized_context_managers.py

diff --cc .vim/bundle/black/tests/data/cases/pattern_matching_complex.py
index 0000000000000000000000000000000000000000,10b4d26e28969defb2b5c22daae726d61a1ff64e..10b4d26e28969defb2b5c22daae726d61a1ff64e
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pattern_matching_complex.py
+++ b/.vim/bundle/black/tests/data/cases/pattern_matching_complex.py

diff --cc .vim/bundle/black/tests/data/cases/pattern_matching_extras.py
index 0000000000000000000000000000000000000000,1e1481d7bbecda80bd9b037764cc086cc8bad4dd..1e1481d7bbecda80bd9b037764cc086cc8bad4dd
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pattern_matching_extras.py
+++ b/.vim/bundle/black/tests/data/cases/pattern_matching_extras.py

diff --cc .vim/bundle/black/tests/data/cases/pattern_matching_generic.py
index 0000000000000000000000000000000000000000,4b4d45f0bffb5966e63225efb87a220bad9f8e0d..4b4d45f0bffb5966e63225efb87a220bad9f8e0d
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pattern_matching_generic.py
+++ b/.vim/bundle/black/tests/data/cases/pattern_matching_generic.py

diff --cc .vim/bundle/black/tests/data/cases/pattern_matching_simple.py
index 0000000000000000000000000000000000000000,6fa2000f0dedc93db0837093443e98376ac78025..6fa2000f0dedc93db0837093443e98376ac78025
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pattern_matching_simple.py
+++ b/.vim/bundle/black/tests/data/cases/pattern_matching_simple.py

diff --cc .vim/bundle/black/tests/data/cases/pattern_matching_style.py
index 0000000000000000000000000000000000000000,2ee6ea2b6e99b5d168227f9803386e92f64f6c9d..2ee6ea2b6e99b5d168227f9803386e92f64f6c9d
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pattern_matching_style.py
+++ b/.vim/bundle/black/tests/data/cases/pattern_matching_style.py

diff --cc .vim/bundle/black/tests/data/cases/pep604_union_types_line_breaks.py
index 0000000000000000000000000000000000000000,fee2b8404943cdbd0ba1592f0646695270d3581a..fee2b8404943cdbd0ba1592f0646695270d3581a
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pep604_union_types_line_breaks.py
+++ b/.vim/bundle/black/tests/data/cases/pep604_union_types_line_breaks.py

diff --cc .vim/bundle/black/tests/data/cases/pep_570.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/pep_572.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/pep_572_do_not_remove_parens.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/pep_572_py310.py
index 0000000000000000000000000000000000000000,9f999deeb89effc38301cf682d19abedcce38f95..9f999deeb89effc38301cf682d19abedcce38f95
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pep_572_py310.py
+++ b/.vim/bundle/black/tests/data/cases/pep_572_py310.py

diff --cc .vim/bundle/black/tests/data/cases/pep_572_py39.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/pep_572_remove_parens.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/pep_604.py
index 0000000000000000000000000000000000000000,b68d59d6440785756af07c118a9d5cbee2ce615d..b68d59d6440785756af07c118a9d5cbee2ce615d
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pep_604.py
+++ b/.vim/bundle/black/tests/data/cases/pep_604.py

diff --cc .vim/bundle/black/tests/data/cases/pep_646.py
index 0000000000000000000000000000000000000000,92b568a379c4202aae7a45e5f0e46bc126eb408d..92b568a379c4202aae7a45e5f0e46bc126eb408d
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pep_646.py
+++ b/.vim/bundle/black/tests/data/cases/pep_646.py

diff --cc .vim/bundle/black/tests/data/cases/pep_654.py
index 0000000000000000000000000000000000000000,12e49180e415f8ea07e81fbc8d99e7eb16ce3e4a..12e49180e415f8ea07e81fbc8d99e7eb16ce3e4a
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pep_654.py
+++ b/.vim/bundle/black/tests/data/cases/pep_654.py

diff --cc .vim/bundle/black/tests/data/cases/pep_654_style.py
index 0000000000000000000000000000000000000000,0d34650e0980fabfd2ed63cf52df37ce818219d9..0d34650e0980fabfd2ed63cf52df37ce818219d9
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/pep_654_style.py
+++ b/.vim/bundle/black/tests/data/cases/pep_654_style.py

diff --cc .vim/bundle/black/tests/data/cases/power_op_newline.py
index 0000000000000000000000000000000000000000,d9b31403c9d639d27cb5addaa7491624710a1301..d9b31403c9d639d27cb5addaa7491624710a1301
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/power_op_newline.py
+++ b/.vim/bundle/black/tests/data/cases/power_op_newline.py

diff --cc .vim/bundle/black/tests/data/cases/power_op_spacing.py
index 0000000000000000000000000000000000000000,b3ef0aae08462ee21c6cf1e6e9ae7193cef62fa8..b3ef0aae08462ee21c6cf1e6e9ae7193cef62fa8
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/power_op_spacing.py
+++ b/.vim/bundle/black/tests/data/cases/power_op_spacing.py

diff --cc .vim/bundle/black/tests/data/cases/prefer_rhs_split_reformatted.py
index 0000000000000000000000000000000000000000,e15e5ddc86d0d3fd445a078c6b35d88b05dbcc59..e15e5ddc86d0d3fd445a078c6b35d88b05dbcc59
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/prefer_rhs_split_reformatted.py
+++ b/.vim/bundle/black/tests/data/cases/prefer_rhs_split_reformatted.py

diff --cc .vim/bundle/black/tests/data/cases/preview_async_stmts.py
index 0000000000000000000000000000000000000000,0a7671be5a6edb0b362123b1237211689bd02422..0a7671be5a6edb0b362123b1237211689bd02422
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_async_stmts.py
+++ b/.vim/bundle/black/tests/data/cases/preview_async_stmts.py

diff --cc .vim/bundle/black/tests/data/cases/preview_cantfit.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/preview_comments7.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_38.py
index 0000000000000000000000000000000000000000,719d94fdcc541cb9416a332f32e7ab0c138ad370..719d94fdcc541cb9416a332f32e7ab0c138ad370
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_context_managers_38.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_38.py

diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_39.py
index 0000000000000000000000000000000000000000,589e00ad187232bf4a1e0d9e089414350bfeb71f..589e00ad187232bf4a1e0d9e089414350bfeb71f
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_context_managers_39.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_39.py

diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_310.py
index 0000000000000000000000000000000000000000,a9e31076f03132958eec3879665f52f5f1b3530c..a9e31076f03132958eec3879665f52f5f1b3530c
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_context_managers_autodetect_310.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_310.py

diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_311.py
index 0000000000000000000000000000000000000000,af1e83fe74c4d0c05e5f3fabb7c31c20bad6e28b..af1e83fe74c4d0c05e5f3fabb7c31c20bad6e28b
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_context_managers_autodetect_311.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_311.py

diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_38.py
index 0000000000000000000000000000000000000000,25217a406042c864dc9fdc4adc8dc2558e72147d..25217a406042c864dc9fdc4adc8dc2558e72147d
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_context_managers_autodetect_38.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_38.py

diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_39.py
index 0000000000000000000000000000000000000000,3f72e48db9d5d876224d8e2230cfffe5d150f26a..3f72e48db9d5d876224d8e2230cfffe5d150f26a
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_context_managers_autodetect_39.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_39.py

diff --cc .vim/bundle/black/tests/data/cases/preview_dummy_implementations.py
index 0000000000000000000000000000000000000000,98b69bf87b230ed5886e19462848689f9d460960..98b69bf87b230ed5886e19462848689f9d460960
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_dummy_implementations.py
+++ b/.vim/bundle/black/tests/data/cases/preview_dummy_implementations.py

diff --cc .vim/bundle/black/tests/data/cases/preview_format_unicode_escape_seq.py
index 0000000000000000000000000000000000000000,65c3d8d166edd5ce8f4f69a6745ad2a345e4acca..65c3d8d166edd5ce8f4f69a6745ad2a345e4acca
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_format_unicode_escape_seq.py
+++ b/.vim/bundle/black/tests/data/cases/preview_format_unicode_escape_seq.py

diff --cc .vim/bundle/black/tests/data/cases/preview_long_dict_values.py
index 0000000000000000000000000000000000000000,fbbacd13d1d959c288d434e485fa5ee52d5a5cc1..fbbacd13d1d959c288d434e485fa5ee52d5a5cc1
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_long_dict_values.py
+++ b/.vim/bundle/black/tests/data/cases/preview_long_dict_values.py

diff --cc .vim/bundle/black/tests/data/cases/preview_long_strings.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/preview_long_strings__east_asian_width.py
index 0000000000000000000000000000000000000000,d190f422a60bf3f119016d13fa1d0fc6d34333eb..d190f422a60bf3f119016d13fa1d0fc6d34333eb
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_long_strings__east_asian_width.py
+++ b/.vim/bundle/black/tests/data/cases/preview_long_strings__east_asian_width.py

diff --cc .vim/bundle/black/tests/data/cases/preview_long_strings__edge_case.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/preview_long_strings__regression.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/preview_long_strings__type_annotations.py
index 0000000000000000000000000000000000000000,8beb877bdd1e02bbc07e0ea723dcd351715d7955..8beb877bdd1e02bbc07e0ea723dcd351715d7955
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_long_strings__type_annotations.py
+++ b/.vim/bundle/black/tests/data/cases/preview_long_strings__type_annotations.py

diff --cc .vim/bundle/black/tests/data/cases/preview_multiline_strings.py
index 0000000000000000000000000000000000000000,3ff643610b7d50cd190f9b17056e8b28f985ae5f..3ff643610b7d50cd190f9b17056e8b28f985ae5f
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_multiline_strings.py
+++ b/.vim/bundle/black/tests/data/cases/preview_multiline_strings.py

diff --cc .vim/bundle/black/tests/data/cases/preview_no_blank_line_before_docstring.py
index 0000000000000000000000000000000000000000,303035a7efbdad5275d8b84025484d7fc63f9fe5..303035a7efbdad5275d8b84025484d7fc63f9fe5
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_no_blank_line_before_docstring.py
+++ b/.vim/bundle/black/tests/data/cases/preview_no_blank_line_before_docstring.py

diff --cc .vim/bundle/black/tests/data/cases/preview_pep_572.py
index 0000000000000000000000000000000000000000,8e801ff6cdc3df0f6ac51582a2936a634ab8bc36..8e801ff6cdc3df0f6ac51582a2936a634ab8bc36
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_pep_572.py
+++ b/.vim/bundle/black/tests/data/cases/preview_pep_572.py

diff --cc .vim/bundle/black/tests/data/cases/preview_percent_precedence.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/preview_power_op_spacing.py
index 0000000000000000000000000000000000000000,650c6fecb2044e0af61f163ef81f85c76f8d5dc9..650c6fecb2044e0af61f163ef81f85c76f8d5dc9
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_power_op_spacing.py
+++ b/.vim/bundle/black/tests/data/cases/preview_power_op_spacing.py

diff --cc .vim/bundle/black/tests/data/cases/preview_prefer_rhs_split.py
index 0000000000000000000000000000000000000000,c732c33b53a8f3d36ef0c71888d0acd1d94608fd..c732c33b53a8f3d36ef0c71888d0acd1d94608fd
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_prefer_rhs_split.py
+++ b/.vim/bundle/black/tests/data/cases/preview_prefer_rhs_split.py

diff --cc .vim/bundle/black/tests/data/cases/preview_return_annotation_brackets_string.py
index 0000000000000000000000000000000000000000,fea0ea6839a6574f2472a390ae876014d18d3da9..fea0ea6839a6574f2472a390ae876014d18d3da9
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_return_annotation_brackets_string.py
+++ b/.vim/bundle/black/tests/data/cases/preview_return_annotation_brackets_string.py

diff --cc .vim/bundle/black/tests/data/cases/preview_trailing_comma.py
index 0000000000000000000000000000000000000000,bba7e7ad16d29bc9a76e0be0ddc341bace1f2d79..bba7e7ad16d29bc9a76e0be0ddc341bace1f2d79
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/preview_trailing_comma.py
+++ b/.vim/bundle/black/tests/data/cases/preview_trailing_comma.py

diff --cc .vim/bundle/black/tests/data/cases/py310_pep572.py
index 0000000000000000000000000000000000000000,172be3898d6612fb71f64bea6315c30a68497a8f..172be3898d6612fb71f64bea6315c30a68497a8f
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/py310_pep572.py
+++ b/.vim/bundle/black/tests/data/cases/py310_pep572.py

diff --cc .vim/bundle/black/tests/data/cases/python37.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/python38.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/python39.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/remove_await_parens.py
index 0000000000000000000000000000000000000000,8c7223d2f3900b7a6e0778665464f9df272a425c..8c7223d2f3900b7a6e0778665464f9df272a425c
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/remove_await_parens.py
+++ b/.vim/bundle/black/tests/data/cases/remove_await_parens.py

diff --cc .vim/bundle/black/tests/data/cases/remove_except_parens.py
index 0000000000000000000000000000000000000000,322c5b7a51b07e74257a989d6668044f54988bce..322c5b7a51b07e74257a989d6668044f54988bce
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/remove_except_parens.py
+++ b/.vim/bundle/black/tests/data/cases/remove_except_parens.py

diff --cc .vim/bundle/black/tests/data/cases/remove_for_brackets.py
index 0000000000000000000000000000000000000000,cd5340462da800a429fa080a3d3037a471cff975..cd5340462da800a429fa080a3d3037a471cff975
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/remove_for_brackets.py
+++ b/.vim/bundle/black/tests/data/cases/remove_for_brackets.py

diff --cc .vim/bundle/black/tests/data/cases/remove_newline_after_code_block_open.py
index 0000000000000000000000000000000000000000,ef2e5c2f6f53fbb02b12191e9f12c3d53aa73721..ef2e5c2f6f53fbb02b12191e9f12c3d53aa73721
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/remove_newline_after_code_block_open.py
+++ b/.vim/bundle/black/tests/data/cases/remove_newline_after_code_block_open.py

diff --cc .vim/bundle/black/tests/data/cases/remove_newline_after_match.py
index 0000000000000000000000000000000000000000,fe6592b664d84ae3fe51d6cbb6f83c405d7a8900..fe6592b664d84ae3fe51d6cbb6f83c405d7a8900
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/remove_newline_after_match.py
+++ b/.vim/bundle/black/tests/data/cases/remove_newline_after_match.py

diff --cc .vim/bundle/black/tests/data/cases/remove_parens.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/remove_with_brackets.py
index 0000000000000000000000000000000000000000,3ee64902a3028bf6d9f04a06de43ebf389e3eab7..3ee64902a3028bf6d9f04a06de43ebf389e3eab7
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/remove_with_brackets.py
+++ b/.vim/bundle/black/tests/data/cases/remove_with_brackets.py

diff --cc .vim/bundle/black/tests/data/cases/return_annotation_brackets.py
index 0000000000000000000000000000000000000000,8509ecdb92c0afd94d92d7d65393ad7332d2e978..8509ecdb92c0afd94d92d7d65393ad7332d2e978
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/return_annotation_brackets.py
+++ b/.vim/bundle/black/tests/data/cases/return_annotation_brackets.py

diff --cc .vim/bundle/black/tests/data/cases/skip_magic_trailing_comma.py
index 0000000000000000000000000000000000000000,4dda5df40f0f252cfa4937efc5caa5e1b1bb5547..4dda5df40f0f252cfa4937efc5caa5e1b1bb5547
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/skip_magic_trailing_comma.py
+++ b/.vim/bundle/black/tests/data/cases/skip_magic_trailing_comma.py

diff --cc .vim/bundle/black/tests/data/cases/slices.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/starred_for_target.py
index 0000000000000000000000000000000000000000,13e517816d65fd63401228b0832c47dac07e854b..13e517816d65fd63401228b0832c47dac07e854b
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/starred_for_target.py
+++ b/.vim/bundle/black/tests/data/cases/starred_for_target.py

diff --cc .vim/bundle/black/tests/data/cases/string_prefixes.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/stub.py
index 0000000000000000000000000000000000000000,f3828d55ba2b302c4521ac238a1dbb96d897667b..f3828d55ba2b302c4521ac238a1dbb96d897667b
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/stub.py
+++ b/.vim/bundle/black/tests/data/cases/stub.py

diff --cc .vim/bundle/black/tests/data/cases/torture.py
index 0000000000000000000000000000000000000000,2a194759a821ecb1b8529dc71cd5d6363a2e69d9..2a194759a821ecb1b8529dc71cd5d6363a2e69d9
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/torture.py
+++ b/.vim/bundle/black/tests/data/cases/torture.py

diff --cc .vim/bundle/black/tests/data/cases/trailing_comma_optional_parens1.py
index 0000000000000000000000000000000000000000,85aa8badb261652e60427d43a5796d42e2e72bec..85aa8badb261652e60427d43a5796d42e2e72bec
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/trailing_comma_optional_parens1.py
+++ b/.vim/bundle/black/tests/data/cases/trailing_comma_optional_parens1.py

diff --cc .vim/bundle/black/tests/data/cases/trailing_comma_optional_parens2.py
index 0000000000000000000000000000000000000000,9541670e3945df95d264f18e1176f38244c6f8cf..9541670e3945df95d264f18e1176f38244c6f8cf
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/trailing_comma_optional_parens2.py
+++ b/.vim/bundle/black/tests/data/cases/trailing_comma_optional_parens2.py

diff --cc .vim/bundle/black/tests/data/cases/trailing_comma_optional_parens3.py
index 0000000000000000000000000000000000000000,c0ed699e6a61c2db737fefdcf727ef58941a6b33..c0ed699e6a61c2db737fefdcf727ef58941a6b33
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/trailing_comma_optional_parens3.py
+++ b/.vim/bundle/black/tests/data/cases/trailing_comma_optional_parens3.py

diff --cc .vim/bundle/black/tests/data/cases/trailing_commas_in_leading_parts.py
index 0000000000000000000000000000000000000000,99d82a677f8359041c030d8b4cadb2f89f966693..99d82a677f8359041c030d8b4cadb2f89f966693
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/trailing_commas_in_leading_parts.py
+++ b/.vim/bundle/black/tests/data/cases/trailing_commas_in_leading_parts.py

diff --cc .vim/bundle/black/tests/data/cases/tricky_unicode_symbols.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/tupleassign.py
Simple merge

diff --cc .vim/bundle/black/tests/data/cases/type_aliases.py
index 0000000000000000000000000000000000000000,7c2009e8202cf9a2820c69d485c36dbd2d1d4551..7c2009e8202cf9a2820c69d485c36dbd2d1d4551
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/type_aliases.py
+++ b/.vim/bundle/black/tests/data/cases/type_aliases.py

diff --cc .vim/bundle/black/tests/data/cases/type_comment_syntax_error.py
index 0000000000000000000000000000000000000000,2e5ca2ede8c9ec1bd63ccc8813e9ad3ed30cd7a9..2e5ca2ede8c9ec1bd63ccc8813e9ad3ed30cd7a9
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/type_comment_syntax_error.py
+++ b/.vim/bundle/black/tests/data/cases/type_comment_syntax_error.py

diff --cc .vim/bundle/black/tests/data/cases/type_params.py
index 0000000000000000000000000000000000000000,720a775ef31bd8ef633fbc47d1e524c63207fdca..720a775ef31bd8ef633fbc47d1e524c63207fdca
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/type_params.py
+++ b/.vim/bundle/black/tests/data/cases/type_params.py

diff --cc .vim/bundle/black/tests/data/cases/whitespace.py
index 0000000000000000000000000000000000000000,a319c0117b19e2d198575c42faf95d6af928ae1b..a319c0117b19e2d198575c42faf95d6af928ae1b
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/cases/whitespace.py
+++ b/.vim/bundle/black/tests/data/cases/whitespace.py

diff --cc .vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/.gitignore
index 0000000000000000000000000000000000000000,2987e7bb646d5d283f6fd130593dda8e2bfc8e51..2987e7bb646d5d283f6fd130593dda8e2bfc8e51
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/gitignore_used_on_multiple_sources/.gitignore
+++ b/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/.gitignore

diff --cc .vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir1/a.py
Simple merge

diff --cc .vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir1/b.py
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/scripts/__init__.py
+++ b/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir1/b.py

diff --cc .vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir2/a.py
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/scripts/__init__.py
+++ b/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir2/a.py

diff --cc .vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir2/b.py
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/scripts/__init__.py
+++ b/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir2/b.py

diff --cc .vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/a.py
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/scripts/__init__.py
+++ b/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/a.py

diff --cc .vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/.gitignore
index 0000000000000000000000000000000000000000,150f68c80f52952b9c2bf25a4348084aee22b2d1..150f68c80f52952b9c2bf25a4348084aee22b2d1
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/ignore_subfolders_gitignore_tests/subdir/.gitignore
+++ b/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/.gitignore

diff --cc .vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/b.py
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/scripts/__init__.py
+++ b/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/b.py

diff --cc .vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/subdir/c.py
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/scripts/__init__.py
+++ b/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/subdir/c.py

diff --cc .vim/bundle/black/tests/data/jupyter/non_python_notebook.ipynb
Simple merge

diff --cc .vim/bundle/black/tests/data/jupyter/notebook_empty_metadata.ipynb
Simple merge

diff --cc .vim/bundle/black/tests/data/jupyter/notebook_no_trailing_newline.ipynb
Simple merge

diff --cc .vim/bundle/black/tests/data/jupyter/notebook_trailing_newline.ipynb
Simple merge

diff --cc .vim/bundle/black/tests/data/jupyter/notebook_which_cant_be_parsed.ipynb
Simple merge

diff --cc .vim/bundle/black/tests/data/jupyter/notebook_without_changes.ipynb
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/async_as_identifier.py
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/blackd_diff.diff
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/blackd_diff.py
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/debug_visitor.out
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/debug_visitor.py
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/decorators.py
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/expression_skip_magic_trailing_comma.diff
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/force_py36.py
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/force_pyi.py
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/invalid_header.py
index 0000000000000000000000000000000000000000,fb49e2f93e725e67d7895800e200c383d72ba7f7..fb49e2f93e725e67d7895800e200c383d72ba7f7
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/miscellaneous/invalid_header.py
+++ b/.vim/bundle/black/tests/data/miscellaneous/invalid_header.py

diff --cc .vim/bundle/black/tests/data/miscellaneous/missing_final_newline.diff
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/missing_final_newline.py
Simple merge

diff --cc .vim/bundle/black/tests/data/miscellaneous/pattern_matching_invalid.py
index 0000000000000000000000000000000000000000,22b5b94c0a46a78e9cc96c7444d902a05e16df71..22b5b94c0a46a78e9cc96c7444d902a05e16df71
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/miscellaneous/pattern_matching_invalid.py
+++ b/.vim/bundle/black/tests/data/miscellaneous/pattern_matching_invalid.py

diff --cc .vim/bundle/black/tests/data/miscellaneous/python2_detection.py
index 0000000000000000000000000000000000000000,8de2bb58adc8e8c833bf79829410afa3a9b32c6e..8de2bb58adc8e8c833bf79829410afa3a9b32c6e
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/miscellaneous/python2_detection.py
+++ b/.vim/bundle/black/tests/data/miscellaneous/python2_detection.py

diff --cc .vim/bundle/black/tests/data/miscellaneous/string_quotes.py
Simple merge

diff --cc .vim/bundle/black/tests/data/project_metadata/both_pyproject.toml
index 0000000000000000000000000000000000000000,cf8f148f856a85e49489d650bff85a4f1b5c0bda..cf8f148f856a85e49489d650bff85a4f1b5c0bda
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/project_metadata/both_pyproject.toml
+++ b/.vim/bundle/black/tests/data/project_metadata/both_pyproject.toml

diff --cc .vim/bundle/black/tests/data/project_metadata/neither_pyproject.toml
index 0000000000000000000000000000000000000000,67623d2279be1bf7291e109c85b8972000de822b..67623d2279be1bf7291e109c85b8972000de822b
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/project_metadata/neither_pyproject.toml
+++ b/.vim/bundle/black/tests/data/project_metadata/neither_pyproject.toml

diff --cc .vim/bundle/black/tests/data/project_metadata/only_black_pyproject.toml
index 0000000000000000000000000000000000000000,94058bb3b1e67050d7f1e4fca992e34479b6ea33..94058bb3b1e67050d7f1e4fca992e34479b6ea33
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/project_metadata/only_black_pyproject.toml
+++ b/.vim/bundle/black/tests/data/project_metadata/only_black_pyproject.toml

diff --cc .vim/bundle/black/tests/data/project_metadata/only_metadata_pyproject.toml
index 0000000000000000000000000000000000000000,1c8cdbb31adff2004e6fb189ef12decb1372140f..1c8cdbb31adff2004e6fb189ef12decb1372140f
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/project_metadata/only_metadata_pyproject.toml
+++ b/.vim/bundle/black/tests/data/project_metadata/only_metadata_pyproject.toml

diff --cc .vim/bundle/black/tests/data/raw_docstring.py
index 0000000000000000000000000000000000000000,751fd3201dff94e31d430d171b90833571505931..751fd3201dff94e31d430d171b90833571505931
mode 000000,100644..100644
--- /dev/null
--- 2/tests/data/raw_docstring.py
+++ b/.vim/bundle/black/tests/data/raw_docstring.py

diff --cc .vim/bundle/black/tests/optional.py
Simple merge

diff --cc .vim/bundle/black/tests/test.toml
Simple merge

diff --cc .vim/bundle/black/tests/test_black.py
Simple merge

diff --cc .vim/bundle/black/tests/test_blackd.py
Simple merge

diff --cc .vim/bundle/black/tests/test_format.py
Simple merge

diff --cc .vim/bundle/black/tests/test_ipynb.py
Simple merge

diff --cc .vim/bundle/black/tests/test_no_ipynb.py
Simple merge

diff --cc .vim/bundle/black/tests/test_trans.py
index 0000000000000000000000000000000000000000,784e852e12a53f1b47faea654e9a208347a8c2ea..784e852e12a53f1b47faea654e9a208347a8c2ea
mode 000000,100644..100644
--- /dev/null
--- 2/tests/test_trans.py
+++ b/.vim/bundle/black/tests/test_trans.py

diff --cc .vim/bundle/black/tests/util.py
Simple merge

diff --cc .vim/bundle/black/tox.ini
Simple merge