[NETBEANS-541] Mercurial command Backout invokes external tool for resolve conflict

• Type: Bug
• Status: Open
• Priority: Trivial
• Resolution: Unresolved
• Component/s: versioncontrol - Mercurial
• Assignee: Unassigned
• Reporter: Vldimir Orlyansky
• Created: 28/Mar/18 22:13
• Updated: 28/Mar/18 22:15

Description

This Issue was found through NetCat 9

Windows 10.

JDK 8 and 10.

NetBeans build 379

Mercurial command Team-Recover-Backout invokes external tool for resolve conflict. In my case NetBeans invokes TortoiseSVN (Tortoise for subversion) diff.

Conflicts can be fixed by external tool. NetBeans can work with such "external" tool.

So problem is only one, NetBeans uses external tool for resolve modification instead using internal NetBeans tool for resolve conflicts.