You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2019/06/26 21:30:50 UTC
[GitHub] [netbeans] hodawg04 opened a new pull request #1333: NETBEANS-544:
Merge conflicts resolver doesn't recognize "|||||||" conflict markers
hodawg04 opened a new pull request #1333: NETBEANS-544: Merge conflicts resolver doesn't recognize "|||||||" conflict markers
URL: https://github.com/apache/netbeans/pull/1333
Updated ResolveConflictsExecutor in Subversion using Git as a reference.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists