aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-mergetool.sh2
1 files changed, 1 insertions, 1 deletions
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
;;