This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
I have looked at the merge behavior on Windows. It is currently not possible to use the internal Resolve Conflict tool. Unofficial "Batteries Included" Windows release of Hg -------------------------------------------------------- I have added support so if the unofficial "batteries included" release: http://qct.sourceforge.net/Mercurial-BI.html is used it will work out of the box. In its <Mercurial Install Dir>\Mercurial.ini they have added: [ui] merge = "C:\Program Files\Mercurial\hgmerge.exe" hgmerge.exe is shipped with this release. Official Windows release of Hg ------------------------------- If the official release is used: http://mercurial.berkwood.com/ then the user needs to modify the <Mercurial Install Dir>\Mercurial.ini to include some other external Merge tool such as kdiff3, as it is not shipped with any on Windows: [ui] merge = "C:\Program Files\Mercurial\kdiff3.cmd" Obtainable from: http://kdiff3.sourceforge.net/ Info on other merge tools: http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram This all needs to be release noted.
Commited changes to head