Hi,

I would like to switch to Mercurial 1.5 and tortoisehg 1.0 but I'm having
trouble configuring diff options :
Here is my current ~/.hgrc  (I'm currently running tortoise 0.9.3 on Linux
Redhat 5.2) :

[ui]
username = LB <-...@--->
merge = meld
editor = gvim

[extensions]
extdiff =
hgext.graphlog =
highlight =
fetch =
rebase =
mq =

[merge-tools]
meld.args = $base $local $other

[extdiff]
cmd.meld =

[tortoisehg]
vdiff = meld
editor = gvim

This seems doesn't work anymore with tortoisehg 1.0 : when I click on a
change in the repository explorer, it launches an empty meld window.
 I  read http://tortoisehg.bitbucket.org/manual/1.0/common.html#adding-toolsand
tried to update my configuration with :

[diff]
diffargs = $parent $child
dirdiff = $parent $child
diff3args = $parent1 $parent2 $child
dir3diff = $parent1 $parent2 $child

This doesn't work either

Could you explain me how I should adapt my configuration to tortoiseHg 1.0
or point me to some examples of configuration using meld ?

Regards,
-- 
LB
------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss

Reply via email to