hgmerge on windows

Christian Boos cboos at neuf.fr
Thu May 18 05:35:40 CDT 2006


Alex Greif wrote:
> I am a hg newby so here is my next question:
> which merge tool do you use in windows, and where do you configure hg
> to call this too and which arguments it should get?
>

If you have cygwin installed, you can use something like this:

$ echo $HGMERGE
sh C:/Workspace/src/hg/mercurial/mpm-hg/hgmerge

-- Christian


More information about the Mercurial mailing list