Checkout Tools
  • last updated 2 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  1. … 2 more files in changeset.