From 1346c9996350e96c7b38a57ede5d503821d84fe3 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 29 Mar 2007 10:05:02 -0400
Subject: [PATCH] mergetool: Make git-rm quiet when resolving a deleted file
 conflict

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 git-mergetool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 58794cad49..7a2b9b9f02 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -95,7 +95,7 @@ resolve_deleted_merge () {
 		return
 		;;
 	    [dD]*)
-		git-rm -- "$path"
+		git-rm -- "$path" > /dev/null
 		cleanup_temp_files
 		return
 		;;
-- 
2.11.4.GIT