From 0b63c1f46d0015973e903ff7b485988518703b12 Mon Sep 17 00:00:00 2001
From: Leonard Hecker <leonard@hecker.io>
Date: Thu, 6 Dec 2018 15:44:59 +0100
Subject: [PATCH] Don't run git merge quietly

This can and will mess up git rebases and force pushes.
---
 share/tools/web_config/sample_prompts/sorin.fish | 5 -----
 1 file changed, 5 deletions(-)

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