views:

281

answers:

1

I am trying to use Beyond Compare for Visual Diff in TortoiseHg. eg Right click on a modified file in explorer and select Visual Diff from TortoiseHg context menu...

BeyondCompare opens but only shows the 'welcome' screen and not the file I want to diff. Am I missing something?

I have setup the mercurial.ini file as follows:

  [extensions]
  extdiff =

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

  [tortoisehg]
  vdiff = bcomp

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

  [ui]
  merge = bcomp
+5  A: 

Found the answer.

Visual Diff Tool in TortoiseHg Global Settings had to be set to 'beyondcompare3' instead of 'bcomp'.

Settings

geoff
Do you know if the 3-way merge tool has to be set to beyondcompare3 too?
jpbochi
by the way, how did you found that out?
jpbochi
@jpbochi - I have 3-way merge set to bcomp and it seems to work fine. I think it was just trial and error although I might have read something somewhere that gave me a pointer.
geoff
Win. This worked for me, too. Thanks.
Jon Sagara