projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mailinfo: barf and exist upon nested multipart.
[git.git]
/
git-merge-one-file-script
diff --git
a/git-merge-one-file-script
b/git-merge-one-file-script
index
be64c07
..
b791107
100755
(executable)
--- a/
git-merge-one-file-script
+++ b/
git-merge-one-file-script
@@
-21,7
+21,9
@@
case "${1:-.}${2:-.}${3:-.}" in
# Deleted in both or deleted in one and unchanged in the other
#
"$1.." | "$1.$1" | "$1$1.")
# Deleted in both or deleted in one and unchanged in the other
#
"$1.." | "$1.$1" | "$1$1.")
- echo "Removing $4"
+ if [ "$2" ]; then
+ echo "Removing $4"
+ fi
if test -f "$4"; then
rm -f -- "$4"
fi &&
if test -f "$4"; then
rm -f -- "$4"
fi &&