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.

Bug 121943 - Merge on Windows is broken
Summary: Merge on Windows is broken
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: 6.x
Hardware: All All
: P3 blocker (vote)
Assignee: issues@versioncontrol
Keywords: RELNOTE
Depends on:
Reported: 2007-11-14 20:34 UTC by John Rice
Modified: 2008-01-03 09:39 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:


Note You need to log in before you can comment on or make changes to this bug.
Description John Rice 2007-11-14 20:34:25 UTC
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: is
used it will work out of the box. In its <Mercurial Install Dir>\Mercurial.ini they have added:
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: 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:
merge = "C:\Program Files\Mercurial\kdiff3.cmd"

Obtainable from:

Info on other merge tools:

This all needs to be release noted.
Comment 1 John Rice 2007-11-14 20:35:04 UTC
Commited changes to head