Tortoisesvn: Set winmerge or beyond compare

Source: Internet
Author: User
Tags tortoisesvn

Winmerge: C: \ Program Files \ winmerge \ winmergeu.exe-e-UB-DL % bname-Dr % yname % base % mine

Beyond compare 3: C: \ Program Files \ beyond compare 3 \ bcomp.exe % mine % base

Diff Viewer

"C: \ Program Files (x86) \ beyond compare 3 \ bcomp.exe" % base % mine/title1 = % bname/title2 = % yname/leftreadonly

Put the same thing for both "comparing different revisions of files" and "comparing different revisions of properties ".
Merge Tool

"C: \ Program Files (x86) \ 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 the diff 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

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.