projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
365cf97
)
mergetool: Make git-rm quiet when resolving a deleted file conflict
author
Theodore Ts'o
<tytso@mit.edu>
Thu, 29 Mar 2007 14:05:02 +0000
(10:05 -0400)
committer
Theodore Ts'o
<tytso@mit.edu>
Thu, 29 Mar 2007 16:29:54 +0000
(12:29 -0400)
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mergetool.sh
patch
|
blob
|
history
diff --git
a/git-mergetool.sh
b/git-mergetool.sh
index 58794cad49a8afa67cba61d110ee4a3170377fac..7a2b9b9f02e03af351d4c820a4d6b560c041960b 100755
(executable)
--- 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
;;