Commit 3f8bcb5e authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Gerrit Code Review
Browse files

Merge changes I38cbe315,Ia05cb31f 

* changes:
  Write conflict tables in image
  Add support for eagerly calculating conflict tables
parents 3ce07dd1 e42888f9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment