From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 29 Mar 2007 14:05:02 +0000 (-0400)
Subject: mergetool: Make git-rm quiet when resolving a deleted file conflict
X-Git-Tag: v1.5.1~19^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1346c9996350e96c7b38a57ede5d503821d84fe3;p=git.git

mergetool: Make git-rm quiet when resolving a deleted file conflict

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 58794cad4..7a2b9b9f0 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
 		;;