Tortoisesvn,tortoisegit Modify the diff viewer to Beyondcompare__java

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