Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions commitizen/cz/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from typing import Any, Callable, Protocol

from jinja2 import BaseLoader, PackageLoader
from prompt_toolkit.styles import Style, merge_styles
from prompt_toolkit.styles import Style

from commitizen import git
from commitizen.config.base_config import BaseConfig
Expand Down Expand Up @@ -77,12 +77,12 @@ def message(self, answers: Mapping[str, Any]) -> str:

@property
def style(self) -> Style:
return merge_styles(
return Style(
[
Style(BaseCommitizen.default_style_config),
Style(self.config.settings["style"]),
*BaseCommitizen.default_style_config,
*self.config.settings["style"],
]
) # type: ignore[return-value]
)

def example(self) -> str:
"""Example of the commit message."""
Expand Down
Loading