1. Bitbucket
  2. Public Issue Tracker
  3. master
  4. Issues

Issues

Issue #7754 invalid

Mac OS X port: TortoiseHg opens Diffmerge but no files are loaded

Anonymous created an issue

I'm using diffmerge as my favourite tool on both Windows and Mac OS X platforms. On Windows it works fine, but on my Mac OS X the Diffmerge opens but doesn't load any files - the window is clean. I'm currently using Kdiff3, which just works fine, but I would prefer Diffmerge.

TortoiseHg version: version 2.8.2+1-54b677d8da4f Diffmerge version: 3.3.2 (I tried 4.0.0, but it didn't help this issue)

in my .hgrc:

[extdiff]
cmd.kdiff3 = /Applications/kdiff3.app/Contents/MacOS/kdiff3
cmd.diffmerge = /usr/bin/diffmerge

[ui]
merge = kdiff3

[merge-tools]
kdiff3.args = $base $local $other -o $output
diffmerge.executable = /usr/bin/diffmerge
diffmerge.args = -merge -result=$output -t1="Local Version" -t2=$output -t3="Other Version" -caption=$output $local $base $other
diffmerge.binary = False
diffmerge.symlinks = False
diffmerge.gui = True

Comments (1)

  1. Log in to comment