Antonio Vieiro created NETBEANS-4663:
----------------------------------------
Summary: Mercurial visual conflict resolution
Key: NETBEANS-4663
URL: https://issues.apache.org/jira/browse/NETBEANS-4663
Project: NetBeans
Issue Type: Improvement
Components: cnd - Remote VCS
Reporter: Antonio Vieiro
The "ResolveConflictsExecutor" [1] for mercurial, responsible for resolving
conflicts, was not included in the CND donation from Oracle, and needs to be
implemented.
http://hg.netbeans.org/cnd-main/file/tip/mercurial.remote/src/org/netbeans/modules/mercurial/remote/ui/update/ResolveConflictsExecutor.java
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
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
