summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-03-29 10:05:02 -0400
committerTheodore Ts'o <tytso@mit.edu>2007-03-29 12:29:54 -0400
commit1346c9996350e96c7b38a57ede5d503821d84fe3 (patch)
tree7780da18be35f3d7b18def76c7d6102d0557be11
parent365cf979c48a52eec65f29a02a973753418396f4 (diff)
downloadgit-1346c9996350e96c7b38a57ede5d503821d84fe3.tar.gz
mergetool: Make git-rm quiet when resolving a deleted file conflict
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rwxr-xr-xgit-mergetool.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 58794cad49..7a2b9b9f02 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
;;