Too many arguments error when trying to use FileMerge as external merge tool on macos

[DanWlker]

For context, this is happening when I'm trying to cherry pick and hit a conflict

Based on the usage command:

If I'm not mistaken this should be the correct way:

xcode and filemerge version:

[DanWlker]

Not sure if you plan to support older versions and whether the change will impact older versions of xcode / file merge. Just a heads up I haven't tested it (by building the app) though cause i just ran into the issue at work

[love-linger]

Fixed.

Not sure if you plan to support older versions and whether the change will impact older versions of xcode / file merge. Just a heads up I haven't tested it (by building the app) though cause i just ran into the issue at work

I think it's just an error in filling in the parameters.

Note

User can modify the diff/merge args for external diff/merge tool since version 2025.40