> Again, I'm hoping people respond to this with their extdiff > configurations and with any changes they've made to the default > merge-tools configuration that ships with Mercurial.
On Ubuntu: [extdiff] cmd.cxdiff = diff opts.cxdiff = -Nprc5 cmd.meld = cmd.cdiff = colordiff opts.cdiff = -uprN cmd.cwdiff = diff opts.cwdiff = -wBNprc -C 5 cmd.kdiff = kdiff3 opts.kdiff = cmd.xxdiff = xxdiff opts.xxdiff = cmd.sub = submerge opts.sub = diff I use hgtk. And I almost never using anything except meld from the above. -parren ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss