DiffMerge on OSX opens DiffMerge, but doesn't load files
Created originally on Bitbucket by waterreaction (Matthew Lai)
I am using thg 3.0.2 on OSX 10.9 with DiffMerge 4.2.0.
My .hgrc looks like this -
#!python
[ui]
username = Matthew Lai <x@x.ca>
merge = diffmerge
[extensions]
hgext.extdiff =
[extdiff]
cmd.diffmerge = /usr/bin/diffmerge
[merge-tools]
diffmerge.executable = /usr/bin/diffmerge
diffmerge.args = --result=$output $local $base $other
diffmerge.binary = False
diffmerge.symlinks = False
diffmerge.gui = True
diffmerge.premerge = True
[tortoisehg]
vdiff = diffmerge
Running "hg diffmerge" on command line works. But when opened from thg, DiffMerge is opened, but the files aren't loaded.
Someone reported the same bug a while ago, but to a wrong project - https://bitbucket.org/site/master/issue/7754/mac-os-x-port-tortoisehg-opens-diffmerge
Thanks!