Allow limiting max conflicts (fixes #2282)

This commit is contained in:
Audrius Butkevicius
2015-10-13 20:50:58 +01:00
parent 2b56961b54
commit 752533489a
6 changed files with 66 additions and 33 deletions

File diff suppressed because one or more lines are too long