Author: jcorvel Revision: 1731699 Modified property: svn:log Modified: svn:log at Mon May 22 21:46:14 2017 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Mon May 22 21:46:14 2017 @@ -1,3 +1,5 @@ +[Note from the future: reverted in r1795861.] + Make our 3-way-diff/merge handling raise a conflict in a very specific case where changes in different ranges that touched each other were applied as adding both ranges in Subversion while other merge tools create a conflict.
