[ https://issues.apache.org/jira/browse/SVN-4632?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Stefan Hett updated SVN-4632: ----------------------------- Attachment: repro.zip As per danielsh's request, attached the repro script to this issue as well. Please note that this is a Windows batch file and hasn't been cleaned up completely. Check the set-calls at the start of the bat-file for the hard-coded paths and adjust if required. > Conflict on merging eol-syle:native property change only > -------------------------------------------------------- > > Key: SVN-4632 > URL: https://issues.apache.org/jira/browse/SVN-4632 > Project: Subversion > Issue Type: Bug > Reporter: Andrey Roussev > Attachments: repro.zip > > > * make a branch from trunk > * add eol-style:native attribute to some file in trunk > * merge that changes into branch > * in subversion 1.8.x, 1.9.x you will get a conflict, in subversion 1.7.x you > will not -- This message was sent by Atlassian JIRA (v6.4.14#64029)