diff options
| -rwxr-xr-x | git-merge-one-file-script | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge-one-file-script b/git-merge-one-file-script index 73e1c50bff..f0353c14b4 100755 --- a/git-merge-one-file-script +++ b/git-merge-one-file-script @@ -23,7 +23,8 @@ case "${1:-.}${2:-.}${3:-.}" in "$1..") echo "WARNING: $4 is removed in both branches." echo "WARNING: This is a potential rename conflict." - exec git-update-cache --remove -- "$4" + rm -f -- "$4" && + exec git-update-cache --remove -- "$4" ;; # |