Commit History

Author SHA1 Message Date
  Audrius Butkevicius 752533489a Allow limiting max conflicts (fixes #2282) 9 years ago
  Audrius Butkevicius 34c04babbe Large refactoring/feature commit 9 years ago