/[Apache-SVN]
ViewVC logotype

Revision 1863285


Jump to revision: Previous Next
Author: julianfoad
Date: Thu Jul 18 13:36:09 2019 UTC (4 years, 8 months ago)
Changed paths: 3
Log Message:
Merge r1855419 from trunk:

 * r1855419
   Fix conflict resolver bug where local and incoming edits got swapped.
   Justification:
     Bug breaks text conflict resolution.
     User complained: https://svn.haxx.se/dev/archive-2019-03/0012.shtml
   Votes:
     +1: stsp
     +0: rhuijben


Changed paths

Path Details
Directorysubversion/branches/1.12.x/ modified , props changed
Directorysubversion/branches/1.12.x/STATUS modified , text changed
Directorysubversion/branches/1.12.x/subversion/libsvn_client/conflicts.c modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26