On Fri, 2005-09-30 at 10:43 +0200, Zbynek Winkler wrote: > Hello! How do you merge on windows? hg complains about missing hgmerge > that is really a shell script. Write a hgmerge.bat script, and use that. Or else install kdiff3 and set the HGMERGE environment variable to point to it. <b