Jose Heitor created NETBEANS-3320:
-------------------------------------
Summary: Subversion visual conflict-resolution merging
Key: NETBEANS-3320
URL: https://issues.apache.org/jira/browse/NETBEANS-3320
Project: NetBeans
Issue Type: Bug
Components: versioncontrol - Subversion
Affects Versions: 11.1, 11.0
Environment: Linux Mint 64-bit; Java 11
Reporter: Jose Heitor
Attachments: after-merge.png, before-merge.png
Conflict resolution merges from Left pane are corrupt (contain diff markers):
!before-merge.png!
...which make it impossible to choose content from the Left side:
!after-merge.png!
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
