On 03/29/2016 11:34 AM, Peter Bergner wrote:
On Wed, 2016-03-23 at 01:49 -0600, Jeff Law wrote:+/* This represents a conflict graph. Implemented as an array of bitmaps. + A full matrix is used for conflicts rather than just upper triangular form. + this make sit much simpler and faster to perform conflict merges. */s/make sit/makes it/
Thanks. Fixed in the obvious way. jeff
