Mercurial > hg

comparison mercurial/defaultrc/mergetools.rc @ 46171:dbc462e34e92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools: add BeyondCompare 4 for Windows This is a copy of the TortoiseHg configuration, but dropping the 3-way diff and dirdiff settings (since those aren't supported in core Mercurial), and swapping the 'parent1', 'parent2', and 'base' literals for `$labellocal`, `$labelother, and `$labelbase` respectively. (That functionality was apparently never ported to TortoiseHg.) Additionally, the single quotes were removed from around these arguments, since none of the other configs have them. Differential Revision: https://phab.mercurial-scm.org/D9635
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 19 Dec 2020 01:42:51 -0500
parents 968766c1a324
children a6efc1f1a73b
comparison
equal deleted inserted replaced
46170:968766c1a324 46171:dbc462e34e92
41 beyondcompare3.gui=True 41 beyondcompare3.gui=True
42 beyondcompare3.priority=-2 42 beyondcompare3.priority=-2
43 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 43 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
44 beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3 44 beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3
45 beyondcompare3.regname=ExePath 45 beyondcompare3.regname=ExePath
46
47 ; Windows version of BeyondCompare 4
48 beyondcompare4.args=$local $other $base /mergeoutput=$output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /outputtitle=merged /automerge /reviewconflicts /solo
49 beyondcompare4.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
50 beyondcompare4.gui=True
51 beyondcompare4.premerge=False
52 beyondcompare4.priority=-1
53 beyondcompare4.regkey=Software\Scooter Software\Beyond Compare 4
54 beyondcompare4.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 4
55 beyondcompare4.regname=ExePath
46 56
47 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output 57 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
48 diffmerge.check=changed 58 diffmerge.check=changed
49 diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child 59 diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
50 diffmerge.gui=True 60 diffmerge.gui=True