mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
mergetool: Make git-rm quiet when resolving a deleted file conflict
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
365cf979c4
commit
1346c99963
|
@ -95,7 +95,7 @@ resolve_deleted_merge () {
|
|||
return
|
||||
;;
|
||||
[dD]*)
|
||||
git-rm -- "$path"
|
||||
git-rm -- "$path" > /dev/null
|
||||
cleanup_temp_files
|
||||
return
|
||||
;;
|
||||
|
|
Loading…
Reference in a new issue