https://wiki.alf.digital/ 2026-04-23T13:44:23+00:00 https://wiki.alf.digital/ https://wiki.alf.digital/lib/exe/fetch.php?media=wiki:dokuwiki.svg text/html 2023-11-01T07:13:10+00:00 Anonymous (anonymous@undisclosed.example.com) https://wiki.alf.digital/doku.php?id=tools:development&rev=1698822790&do=diff SVN For sync and merge - use TortoiseSVN and P4Merge as external merge viewer. How to integrate P4Merge into TortoiseSVN: <http://1024strongoxen.blogspot.de/2011/08/three-way-merging-made-painless-with.html> Add in the External Programs / Diff Viewer the path with these args: C:\Program Files\Perforce\p4merge.exe %base %mine And in the Merge Tool section: C:\Program Files\Perforce\p4merge.exe %base %theirs %mine %merged