Sunday, May 1, 2011

Tortoise SVN + Beyond Compare integration

Diff:
"C:\Program Files\Beyond Compare 3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

Merge (v3 Pro):
"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

Merge (v3 Std):
"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs /mergeoutput=%merged

No comments: