1.TORTOISESVN Modify the diff viewer for Beyondcompare: (1). Set the program to compare different versions of the file, select External (external), and fill in the following text box: "D:\DevelopTools\Beyond compare\ BComp.exe "%base%mine/title1=%bname/title2=%yname/leftreadonly--The previous section is my BComp.exe directory (2). Set up programs that compare different versions of properties. Select External (external) and fill in the following text box: D:\DevelopTools\Beyond compare\bcompare.exe--Is my BCompare.exe directory in English:
Chinese version:
(3). Set up a resolver to resolve the conflict, select External (external), and fill in the following text box: "D:\DevelopTools\Beyond compare\bcomp.exe"%mine%theirs%base%merged/ Title1=%yname/title2=%tname/title3=%bname/title4=%mname--The previous section is the directory where my BComp.exe resides. English version:
Chinese version:
The 2.TortoiseGit setting is the same as the tortoisesvn above: (1).
(2).
Note that each of these steps can be set independently.
Tortoisegit Download Address: http://download.csdn.net/detail/sanfye/8992773
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.
