mergetool: Make git-rm quiet when resolving a deleted file conflict
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o committed
Mar 29, 2007 at 10:05 UTC
1346c9996350e96c7b38a57ede5d503821d84fe3
1 file changed
+1
-1
git-mergetool.sh
+1
-1
@@ -95,7 +95,7 @@ resolve_deleted_merge () {
95
return
96
;;
97
[dD]*)
98
- git-rm -- "$path"
98
+ git-rm -- "$path" > /dev/null
99
cleanup_temp_files
100
return
101
;;