On Fri, 17 May 2013 15:39:59 -0700, Ross Boylan wrote: > My intervention into the diff system seems to have come undone. I > upgraded thg (now at 2.7) and it overwrote the changes I made to > MergeTools.rc. I think I have restored the changes (details in the > quoted message below), but diff's are no longer running through my > custom script. > > Any ideas what's going on? > > BTW, it's fair enough my changes were overwritten since they are under > program files. But is there a way to make them persistent? It didn't > look to me as if I could insert the rules in my Mercurial.ini, but > perhaps I'm wrong.
Hi, You can %include your/MergeTools.rc from Mercurial.ini. http://www.selenic.com/mercurial/hgrc.5.html#syntax To see the active config values, try "hg showconfig --debug". Regards, ------------------------------------------------------------------------------ AlienVault Unified Security Management (USM) platform delivers complete security visibility with the essential security capabilities. Easily and efficiently configure, manage, and operate all of your security controls from a single console and one unified framework. Download a free trial. http://p.sf.net/sfu/alienvault_d2d _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
