[PATCH] mergetool: Make git-rm quiet when resolving a deleted file conflict
From: Theodore Ts'o <tytso@mit.edu>
Date: 2016-06-15 22:43:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> --- 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