From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 29 Mar 2007 15:44:24 GMT
Subject: [PATCH] mergetool: Make git-rm quiet when resolving a deleted file conflict
Message-ID: <11751830652512-git-send-email-tytso@mit.edu>
In-Reply-To: <11751830651076-git-send-email-tytso@mit.edu>

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

diff --git a/git-mergetool.sh b/git-mergetool.sh
index b0d28fd..b9d81f5 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -97,7 +97,7 @@ resolve_deleted_merge () {
 		return
 		;;
 	    [dD]*)
-		git-rm -- "$path"
+		git-rm -- "$path" > /dev/null
 		cleanup_temp_files
 		return
 		;;
-- 
1.5.1.rc2.1.g8afe-dirty