IT:AD:BeyondCompare

Navigation:

  <callout type="Navigation" class="small">

* (UP)

• HowTo

• (UP)

  • IT:AD:BeyondCompare:HowTo:3-Way Merge

</callout>

At CORP, you can compare the A and B files in

C:\Program Files\SourceGear\Common\DiffMerge

## Installation:Hg ## Officially, from BeyondCompare, one does:

Tortoise Hg 2.0.2 and newer can be configured using the graphical interface:

Diff

Launch TortoiseHG Workbench. Under the File menu go to Settings. Select TortoiseHg. Set Visual Diff Tool to beyondcompare3 using the dropdown. 3-way Merge (v3 Pro)

Launch TortoiseHG Workbench. Under the File menu go to Settings. Select TortoiseHg Set the Three-way Merge Tool to beyondcompare3 using the dropdown. Older versions of Mercurial must be configured manually. To configure Mercurial you need to edit the file %USERPROFILE%\Mercurial.ini or $HOME/.hgrc. Add the following lines, using existing INI sections if they already exist:

Diff

[extensions]
extdiff =

[extdiff]
cmd.bcomp = C:\Program Files\Beyond Compare 3\BComp.exe
opts.bcomp = /ro

[tortoisehg]
vdiff = bcomp

Once set up you can compare revisions from the command line using hg bcomp -r <rev1> [-r <rev2>] [<filename>]

3-way Merge (v3 Pro)

[merge-tools]
bcomp.executable = C:\Program Files\Beyond Compare 3\BComp.exe
bcomp.args = $local $other $base $output
bcomp.priority = 1
bcomp.premerge = True
bcomp.gui = True

[ui]
merge = bcomp

Unofficially, according to this post:

[ui]
merge = bc3m

[extensions]
extdiff=

[extdiff]
cmd.bc3d = C:\Program Files (x86)\Beyond Compare 3\bcomp.exe
opts.bc3d = /lro

[merge-tools]
bc3m.executable = C:\Program Files (x86)\Beyond Compare 3\bcomp.exe
bc3m.args = $local $other $base $output /automerge /reviewconflicts /closescript /lro /rro /title1="Left parent" /title2="Right parent" /title3="Common base" /title4="Merged output"
bc3m.priority = 1
bc3m.premerge = True
bc3m.gui = True

[tortoisehg]
vdiff=bc3d