Mozilla: hg as a collaboration tool

[Lee Cantey]

The latest installer (at http://mercurial.berkwood.com) supports a  
number of merge tools out of the box now due to the recent changes in  
the core merge logic.  The configuration is located in the  
Mercurial.ini that the installer writes for you so backup your copy if  
needed and let it write a new configuration or take at look at  
mergetools.hgrc in contrib directory of the sources (http://selenic.com/repo/hg/file/b7f44f01a632/contrib/mergetools.hgrc 
  is current tip).

Regards,
Lee

On Feb 7, 2008, at 7:24 AM, Guo Tang wrote:

> He forgot to setup hgmerge.cmd. The hgmerge.cmd does not come with  
> 0.9.5
> binary installation package. So after "hg merge", he checked in his  
> old
> version again.  I suggested him to take a look at
>
> http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram
>
> to setup hgmerge.cmd
>
> Can anyone here really do lots of merge in windows environment  
> suggest a
> tool, and post to his blog?