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

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
18 years ago · 1346c99963
1 changed files with 1 additions and 1 deletions
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@ -95,7 +95,7 @@ resolve_deleted_merge () {
				@@ -95,7 +95,7 @@ resolve_deleted_merge () {
 		return
 		;;
 	    [dD]*)
-		git-rm -- "$path"
+		git-rm -- "$path" > /dev/null
 		cleanup_temp_files
 		return
 		;;