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

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mirror · Mar 29, 2007 · 1346c99 · 1346c99
1 parent 365cf97
commit 1346c99
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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
 		;;