无法使用diff查看器&使用Tortoisegit 2.13及以后的合并工具比较4.4.2
无法使用diff查看器&使用Tortoisegit 2.13及以后的合并工具比较4.4.2
右键单击文件夹 - > Tortoisegit->设置
diff查看器 c:\ program文件\ winmerge \ winmergeu.exe -e -e -ub -dl%bname -dr%yname%base%base%mine
d:\ exhere.4.4.4.2.26348.portable \ bcompareportable.exe%1%%%2% /leftTitle =“%3%” /rightTitle =“%4%”
合并工具< /strong> c:\ program文件\ winmerge \ winmergeu.exe /e /e /e /ub /fr /wl /wm /dl%bname /dm%tname /dr%yname%base%base%shs%mine /o mish /o merged /ar erged /ar d:\ exhyow.4.4.4.2.26348.portable \ bcompareportable.exe%1%%%%2%%a% /mergeOutput =%o% /leftTitle =“%4%” /rightTitle =“%5%” /centerTitle = “%3%”
Unable to use Diff Viewer & Merge Tool using TortoiseGit 2.13 and Beyond Compare 4.4.2
Right click on Folder --> TortoiseGit --> Settings
Diff Viewer
Before
C:\Program Files\WinMerge\WinMergeU.exe -e -ub -dl %bname -dr %yname %base %mine
After
D:\Beyond.Compare.4.4.2.26348.Portable\BComparePortable.exe %1% %2% /lefttitle="%3%" /righttitle="%4%"
Merge Tool
Before
C:\Program Files\WinMerge\WinMergeU.exe /e /ub /fr /wl /wm /dl %bname /dm %tname /dr %yname %base %theirs %mine /o %merged /ar
After
D:\Beyond.Compare.4.4.2.26348.Portable\BComparePortable.exe %1% %2% %a% /mergeoutput=%o% /lefttitle="%4%" /righttitle="%5%" /centertitle="%3%"
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

Try these paths:
D:\Beyond.Compare.4.4.2.26348.Portable\BComparePortable.exe %base %mine /lefttitle="%bname" /righttitle="%yname"
D: \ exherd.4.4.4.2.26348.portable \ bcompareportable.exe%mine%的%base /mergeOutput =%merged /merged /leftTitle =“%yname” /yname“ /rightTitle =”%tname“ /centertitle =”%bname < /bname“ < /code> bname” < /code> < /code> code> < /code> code>”
(如果您在Tortoisegit设置中按
f1
,您将获得有关变量名称及其描述的帮助。)Try these paths:
D:\Beyond.Compare.4.4.2.26348.Portable\BComparePortable.exe %base %mine /lefttitle="%bname" /righttitle="%yname"
D:\Beyond.Compare.4.4.2.26348.Portable\BComparePortable.exe %mine %theirs %base /mergeoutput=%merged /lefttitle="%yname" /righttitle="%tname" /centertitle="%bname"
(If you press
F1
in TortoiseGit Settings, you will get help with variables names and their description.)