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

2021-04-07 Thread ASF GitHub Bot (Jira)
[ https://issues.apache.org/jira/browse/NETBEANS-4663?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] ASF GitHub Bot updated NETBEANS-4663: - Labels: CND-DONATION-TODO pull-request-available (was: CND-DONATION-TODO) >

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

2020-08-06 Thread Antonio Vieiro (Jira)
[ https://issues.apache.org/jira/browse/NETBEANS-4663?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Antonio Vieiro updated NETBEANS-4663: - Parent: NETBEANS-4619 Issue Type: Sub-task (was: Improvement) > Mercurial

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

2020-07-31 Thread Antonio Vieiro (Jira)
[ https://issues.apache.org/jira/browse/NETBEANS-4663?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Antonio Vieiro updated NETBEANS-4663: - Description: The "ResolveConflictsExecutor" [1] for both mercurial and subversion,

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

2020-07-31 Thread Antonio Vieiro (Jira)
[ https://issues.apache.org/jira/browse/NETBEANS-4663?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Antonio Vieiro updated NETBEANS-4663: - Labels: CND-DONATION-TODO (was: ) > Mercurial and Subversion visual conflict

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

2020-07-31 Thread Antonio Vieiro (Jira)
[ 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