tree 329cd39286baa052c940555cd50415ce194c172b
parent db8daf0694cfdd369bceb9407dfd24692e006d87
author svn-role <svn-role@unknown> 1611979258 +0000
committer svn-role <svn-role@unknown> 1611979258 +0000

Merge r1885983 from trunk:

 * r1885983
   Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
   Justification:
     Bugfix; 'svn info --xml' should give correct results; user complained.
   Votes:
     +1: hartmannathan, stsp, jcorvel


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.14.x@1886044 13f79535-47bb-0310-9956-ffa450edef68