On Wed, May 27, 2009 at 10:41 AM, Steve Borho <[email protected]> wrote: > On Wed, May 27, 2009 at 9:13 AM, John Sparrow > <[email protected]> wrote: >> I'm a bit confused about setting my visual diff tool to TortoiseMerge, can >> someone help? >> >> I uncommented the line from '\program files\tortoisehg\mercurial.ini' and >> that worked fine, but then I noticed the comment at the top telling me not >> to.. >> >> So instead should I edit '\docs and settings\me\mercurial.ini', and what >> should I put in it (it seems almost empty! > > You can copy the [extdiff] section from the site-wide Mercurial.ini > into your user file. But you would be best served reading the hgrc > man page, and the Extdiff page on the Mercurial wiki. > > http://www.selenic.com/mercurial/hgrc.5.html > http://www.selenic.com/mercurial/wiki/ExtdiffExtension
See also http://bitbucket.org/tortoisehg/stable/wiki/FAQ#how-can-i-use-winmerge-as-my-visual-diff-tool http://bitbucket.org/tortoisehg/stable/wiki/FAQ#how-can-i-use-araxis-merge-as-my-visual-diff-tool -- Steve Borho ------------------------------------------------------------------------------ Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT is a gathering of tech-side developers & brand creativity professionals. Meet the minds behind Google Creative Lab, Visual Complexity, Processing, & iPhoneDevCamp as they present alongside digital heavyweights like Barbarian Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
