[jira] [Updated] (NETBEANS-4663) Mercurial and Subversion visual conflict resolution

["Antonio Vieiro (Jira)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/NETBEANS-4663?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Antonio Vieiro updated NETBEANS-4663:
-------------------------------------
    Summary: Mercurial and Subversion visual conflict resolution  (was: Mercurial visual conflict resolution)

> Mercurial and Subversion 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
>            Priority: Major
>
> 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-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists