diff options
| -rwxr-xr-x | git-merge-one-file-script | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-merge-one-file-script b/git-merge-one-file-script index 88ad3ed..9802f67 100755 --- a/git-merge-one-file-script +++ b/git-merge-one-file-script @@ -22,8 +22,11 @@ case "${1:-.}${2:-.}${3:-.}" in # "$1.." | "$1.$1" | "$1$1.") echo "Removing $4" - rm -f -- "$4" && - exec git-update-cache --remove -- "$4" + if test -f "$4" + then + rm -f -- "$4" + fi && + exec git-update-cache --remove -- "$4" ;; # |