diff --git a/share/tools/web_config/sample_prompts/sorin.fish b/share/tools/web_config/sample_prompts/sorin.fish index 9cacd0d18..8f6c67cb1 100644 --- a/share/tools/web_config/sample_prompts/sorin.fish +++ b/share/tools/web_config/sample_prompts/sorin.fish @@ -25,11 +25,6 @@ function fish_right_prompt git name-rev --name-only HEAD - # Merging state - git merge -q 2>/dev/null - or printf ':'(set_color red)'merge' - printf ' ' - # Symbols if set -l count (command git rev-list --count --left-right $upstream...HEAD 2>/dev/null) echo $count | read -l ahead behind