TortoiseSVN设置Beyond Compare

TORTOISEGIT

Diff

1. Launch TortoiseGit | Settings
2. Switch to the Diff Viewer section under External Programs
3. Change the radio buttons from TortoiseMerge to External.
4. In the path edits, enter:
   "C:\Program Files\Beyond Compare 3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

3-way Merge (v3 Pro)

1. Launch TortoiseGit | Settings
2. Switch to the Merge Tool section under External Programs
3. Change the radio buttons from TortoiseMerge to External.
4. In the path edits, enter:
   "C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

---

TORTOISESVN

Diff

1. Select Settings from Explorer's TortoiseSVN submenu.
2. Switch to the Diff Viewer tab.
3. Change the radio buttons from TortoiseMerge to External.
4. In the path edits, enter:
   "C:\Program Files\Beyond Compare 3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

To use Beyond Compare for image comparisons either replace the file C:\Program Files\TortoiseSVN\bin\TortoiseIDiff.exe with a copy of BComp.exe, or click the Advanced button on theDiff Viewer tab and add each image type's extension with the same command line as above.

3-way Merge (v3 Pro)

1. Select Settings from Explorer's TortoisSVN submenu.
2. Switch to the Merge Tool tab.
3. Change the radio buttons from TortoiseMerge to External.
4. In the path edits, enter:
   "C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

2-way Merge (v3 Std, v2)

Use the same steps as above, but use the command line:
"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs /savetarget=%merged