On Tue, Mar 9, 2010 at 12:59 PM, LB <[email protected]> wrote: > 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
BTW: You almost certainly want 'gvim -f' here > [extensions] > extdiff = > hgext.graphlog = > highlight = > fetch = > rebase = > mq = > > [merge-tools] > meld.args = $base $local $other > > [extdiff] > cmd.meld = and you'll want to either rename this extdiff config so it doesn't conflict with the [merge-tools] configuration, or remove it. -- Steve Borho ------------------------------------------------------------------------------ Download Intel® 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
