Syncro SVN Client

Under Options->Preferences->Diff I can specify an external tool to use for diffs and merges, but I have to use the same call and arguments whether it is a diff or a merge. So if my diffs need to be:
C:\Program Files\Perforce\p4merge.exe ${secondFile} ${firstFile}

And my merges need to be:
C:\Program Files\Perforce\p4merge.exe -nl "target:${firstFile}" -nr "source:${secondFile}" -nb "base:${ancestorFile}" -nm "mergedResult:${firstFile}" ${ancestorFile} ${firstFile} ${secondFile} ${firstFile}

Do I need to change the call every time I switching between needing a 2-file diff vs a 3-way merge?

Hi,

A solution should be to use an intermediate script. More about this here.

Best Regards,
Florin Avram
----------------------
Syncro SVN Client Team