--- C:\Program Files\git\mingw64\libexec\git-core\mergetools\vimdiff.orig	Mon Jun 27 18:44:28 2022
+++ C:\Program Files\git\mingw64\libexec\git-core\mergetools\vimdiff	Tue Jul 12 10:26:48 2022
@@ -414,8 +414,8 @@
 
 	if $base_present
 	then
-		eval "$merge_tool_path" \
-			-f "$FINAL_CMD" "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
+		eval \"$merge_tool_path\" \
+			-f \"$FINAL_CMD\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" \"$MERGED\"
 	else
 		# If there is no BASE (example: a merge conflict in a new file
 		# with the same name created in both braches which didn't exist
@@ -424,8 +424,8 @@
 		FINAL_CMD=$(echo "$FINAL_CMD" | \
 			sed -e 's:2b:quit:g' -e 's:3b:2b:g' -e 's:4b:3b:g')
 
-		eval "$merge_tool_path" \
-			-f "$FINAL_CMD" "$LOCAL" "$REMOTE" "$MERGED"
+		eval \"$merge_tool_path\" \
+			-f \"$FINAL_CMD\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
 	fi
 
 	ret="$?"