fix confict prefix

Spitfire1900 · Mar 28, 2024 · 1be57da · 1be57da
1 parent d7dd654
commit 1be57da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/xontrib/pygitstatus/entrypoint.py b/xontrib/pygitstatus/entrypoint.py
@@ -2,7 +2,7 @@
 
 from xonsh.built_ins import XonshSession
 
-from .prompts import (ahead, behind, branch, changed, clean, conflict, curr_branch,
+from .prompts import (ahead, behind, branch, changed, clean, conflicts, curr_branch,
                       deleted, repo_path, short_head, staged, stash_count, tag,
                       tag_or_hash, untracked)
 
@@ -34,7 +34,7 @@ def _load_xontrib_(xsh: XonshSession, **_) -> dict:
     prompt_fields['pygitstatus.branch'] = branch
     prompt_fields['pygitstatus.changed'] = changed
     prompt_fields['pygitstatus.clean'] = clean
-    prompt_fields['pygitstatus.conflicts'] = conflict
+    prompt_fields['pygitstatus.conflicts'] = conflicts
     prompt_fields['pygitstatus.deleted'] = deleted
     prompt_fields['pygitstatus.repo_path'] = repo_path
     prompt_fields['pygitstatus.short_head'] = short_head

diff --git a/xontrib/pygitstatus/prompts.py b/xontrib/pygitstatus/prompts.py
@@ -70,8 +70,8 @@ def changed(fld: PromptField, ctx: PromptFields):
             fld.value = str(untracked_count)
 
 
-@PromptField.wrap(prefix="{RED}-", suffix="{RESET}", info="deleted")
-def conflict(fld: PromptField, ctx: PromptFields):
+@PromptField.wrap(prefix="{RED}×", suffix="{RESET}", info="conflicts")
+def conflicts(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
         repo = Repo('.')