Hello Marco,
It appears there is an issue with the way Git is passing the file paths to the MATLAB diff and merge tools. This can sometimes happen due to differences in path formats between Cygwin and native Windows applications. Here are a few steps you can try to resolve the issue:
- Ensure Correct Path Formatting: Cygwin uses a Unix-like path format, which may not be correctly interpreted by Windows applications. Make sure that the paths provided to mlDiff.exe and mlMerge.exe are in Windows format.
- Use Native Windows Git: If you're using Cygwin's Git, try switching to a native Windows version of Git, such as Git for Windows. This may resolve any path compatibility issues.
- Adjust Git Configuration: Modify your .git/config to use the native Windows path for the temporary files. You can use a shell script to convert Cygwin paths to Windows paths if needed.
- Check for Spaces in Paths: If your MATLAB path contains spaces, ensure that the command in .git/config correctly handles spaces. You might need to wrap the entire command in single quotes and the paths in double quotes.
I hope this helps
