On Thu, 27 Nov 2014 20:25:59 +0000, Thomas Sai Kidd Ng wrote:
> This is what I did:
>
> 1. I downloaded the mergetools.rc and put it in
> /etc/mercurial/hgrc.d/mergetools.rc . I also ran
>
> $ hg config merge-tools.meld.args ―debug
>
> this and I have the following output.
>
> read config from: /usr/local/etc/mercurial/hgrc
> read config from: /etc/mercurial/hgrc
> read config from: /etc/mercurial/hgrc.d/mergetools.rc
> read config from: /Users/thomastskng/.hgrc
> /etc/mercurial/hgrc.d/mergetools.rc:41: --label='local' $local --label='base'
> $base --label='other' $other
Looks good.
Just in case, run the same command in TortoiseHg Workbench's Console (=Output
Log) widget.
> 2. I then do $ which meld in terminal, which returns “/opt/local/bin/meld”.
> And I also added
>
> setenv PATH /usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/local/bin/
>
> to the /etc/launchd.conf file, since my TortoiseHg is a GUI application.
Restart the Mac if you didn't. If everything is okay, "meld" should be listed
in TortoiseHg Settings -> TortoiseHg -> Three-way Merge Tool.
If none of them helps, try the following configuration as a last ditch.
[merge-tools]
meld.executable = /opt/local/bin/meld
> As a side note, I was able to launch meld from the command line but every
> time I launch meld, I kept the following warning messages and I am not sure
> if these messages are relevant to the problem at hand now.
>
> Couldn't bind the translation domain. Some translations won't work.
> 'module' object has no attribute 'bind_textdomain_codeset'
>
> ** (process:635): WARNING **: Trying to register gtype 'GMountMountFlags'
> as enum when in fact it is of type 'GFlags'
They are warnings of meld and Gtk, so they won't be related.
Regards,
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
