Syncro SVN Client

External Diff Tool

Other Syncro SVN Client issues not covered by the other forums.

External Diff Tool

Postby RobertGordon » Wed Oct 31, 2012 7:40 pm

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?
Posts: 3
Joined: Wed Oct 31, 2012 4:58 pm

Re: External Diff Tool

Postby Florin » Thu Nov 01, 2012 11:02 am


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

Best Regards,
Florin Avram
Syncro SVN Client Team
Posts: 133
Joined: Mon Aug 10, 2009 4:02 pm

Return to Other Issues

Who is online

Users browsing this forum: No registered users and 0 guests


© 2002-2013 SyncRO Soft Ltd. All rights reserved. | Sitemap | Terms of Use | Privacy Policy | This website was created & generated with <oXygen/>® XML Editor