Checkout
Julian Foad
committed
on 18 Jul
Merge the 1.10.x-r1855419 branch:

* r1855419
Fix conflict resolver bug where local and incoming edits got swapped.
Justification:
Show more
Merge the 1.10.x-r1855419 branch:

* 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

  Branch:

    ^/subversion/branches/1.10.x-r1855419

  Votes:

    +1: stsp

Show less