diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 5349a1c0fc54eb0b7feaf6192d20b6c6b2ab5e3b..5619409f1c7ee9c694c2de59aff195f971502226 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
fi
if test -f "$4"; then
rm -f -- "$4" &&
- rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null || :
+ rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
fi &&
exec git-update-index --remove -- "$4"
;;