diff options
Diffstat (limited to 'git-merge-one-file-script')
| -rwxr-xr-x | git-merge-one-file-script | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-merge-one-file-script b/git-merge-one-file-script index be64c0728..b791107fd 100755 --- 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.") - echo "Removing $4" + if [ "$2" ]; then + echo "Removing $4" + fi if test -f "$4"; then rm -f -- "$4" fi && |