我需要使用 mercurial 来运行 beyond compare。我已尝试过(在 中.hgrc
)。
[extensions]
hgext.extdiff=
[extdiff]
cmd.vdiff = C:\Program Files (x86)\Beyond Compare 3\bcomp.exe
它可以工作;但是它会导致命令(hg vdiff file_name.c
)直到我退出 beyond compare 才能完成,这是预料之中的。
为了独立竞选,我尝试
cmd.vdiff = start /b "" "C:\Program Files (x86)\Beyond Compare 3\bcomp.exe"
和
cmd.vdiff = start /b "C:\Program Files (x86)\Beyond Compare 3\bcomp.exe"
和
cmd.vdiff = start /b C:\Program Files (x86)\Beyond Compare 3\bcomp.exe
但我不断
The file name, directory name, or volume label syntax is incorrect
答案1
[merge-tools]
beyondcompare3.args=$local $other $base /mergeoutput=$output /ro /lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged /automerge /reviewconflicts /solo
beyondcompare3.premerge=False
beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3
beyondcompare3.regname=ExePath
beyondcompare3.gui=True
beyondcompare3.priority=-1
beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
beyondcompare3.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
beyondcompare3.dirdiff=True
...
[ui]
merge = beyondcompare3
在 mercurial.ini 中,两个 (diff|merge) 操作都将在 BC3 中执行