Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
---
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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html