Friday, June 07, 2013

TortoiseSVN settings to use DiffMerge

Diff Viewer: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe /t1=Original /t2=Mine %base %mine

Merge: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe /t1=Theirs /t2=Base /t3=Mine /r=%merged %theirs %base %mine

No comments: