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 58794cad49a8afa67cba61d110ee4a3170377fac..7a2b9b9f02e03af351d4c820a4d6b560c041960b 100755 (executable)
--- 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
                ;;