X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-merge-one-file.sh;h=5619409f1c7ee9c694c2de59aff195f971502226;hp=5349a1c0fc54eb0b7feaf6192d20b6c6b2ab5e3b;hb=HEAD;hpb=d9ad59e7636d98daa6131e9fd2cb2b4f5745a853

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 5349a1c0..5619409f 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -26,7 +26,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 	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"
 	;;