On Thu, Apr 29, 2010 at 9:59 AM, Neal Becker <ndbeck...@gmail.com> wrote: > So if the mergetools.rc that is packaged with mercurial (and installed by > the Fedora mercurial package) doesn't work with hgtk, what should be done > about packaging for mercurial and hgtk on Fedora (and other distr)?
This was all discussed at length about three months ago. The TortoiseHg mergetools.rc is a superset of the Mercurial version. Linux packages of TortoiseHg are supposed to package our mergetools.rc as thgmergetools.rc or some other name that makes it get parsed after Mercurial's file, so you get our improvements. The intent was to back-port these changes to Mercurial's extdiff and mergetools.rc, but that effort stalled from lack of interest. -- Steve Borho ------------------------------------------------------------------------------ _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
