On Fri, Jan 25, 2013 at 08:19:15PM -0000, pbu...@apache.org wrote: > Author: pburba > Date: Fri Jan 25 20:19:15 2013 > New Revision: 1438683 > > URL: http://svn.apache.org/viewvc?rev=1438683&view=rev > Log: > Fix issue #4306 'multiple editor drive file merges record wrong mergeinfo > during conflicts'.
Hey Paul, nice fix. I've created a backport branch for this and nominated it for 1.7.x.
