Vldimir Orlyansky created NETBEANS-541:
------------------------------------------
Summary: Mercurial command Backout invokes external tool for
resolve conflict
Key: NETBEANS-541
URL: https://issues.apache.org/jira/browse/NETBEANS-541
Project: NetBeans
Issue Type: Bug
Components: versioncontrol - Mercurial
Reporter: Vldimir Orlyansky
This Issue was found through NetCat 9
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.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
