mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool: Make git-rm quiet when resolving a deleted file conflict

Browse Source 
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o
2007-03-29 10:05:02 -04:00
parent 365cf979c4
commit 1346c99963
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-mergetool.sh
View File

@ -95,7 +95,7 @@ resolve_deleted_merge () {
return return
;; ;;
[dD]*) [dD]*)
git-rm -- "$path" git-rm -- "$path" > /dev/null
cleanup_temp_files cleanup_temp_files
return return
;; ;;