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 76682

Summary:	Better merge support in diff windows
Product:	utilities	Reporter:	ieising <ieising>
Component:	Diff	Assignee:	diff-issues@utilities <diff-issues>
Status:	RESOLVED DUPLICATE
Severity:	blocker
Priority:	P3
Version:	5.x
Hardware:	All
OS:	All
Issue Type:	ENHANCEMENT	Exception Reporter:

Description ieising 2006-05-22 13:43:22 UTC

Hi,

I would favor a little button next to differences between 2 files, where I can
replace the code left by the code right or vise versa. This would be clearer
than the current "Accept" button. The Araxis Merge tool from Araxis is superior
when it comes to diffing and merging.

Iwan

Comment 1 Maros Sandor 2008-04-08 12:58:21 UTC

Should be covered by the long-planned merge UI facelift.

Comment 2 kate 2008-04-23 11:22:01 UTC


*** This issue has been marked as a duplicate of 25501 ***