hgmerge on windows

[Bryan O'Sullivan]

On Wed, 2006-05-17 at 14:05 +0200, Alex Greif wrote:
> I am a hg newby so here is my next question:
> which merge tool do you use in windows,

You should try kdiff3.  There's a Windows port available.

>  and where do you configure hg
> to call this too and which arguments it should get?

Take a look at the script that Thomas pointed at (put this in a .bat
file, and set HGMERGE to the name of the .bat file):

kdiff3 --auto -L1 Base -L2 Local -L3 Other %2 %1 %3 -o %1

	<b